diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h
index 37dd75c4f9ac051a0fcef52934bfbe82b9b75421..be0f4044dd1f5c44de9b29bbf8476d9c6dc97afd 100644
--- a/lnet/klnds/gmlnd/gmlnd.h
+++ b/lnet/klnds/gmlnd/gmlnd.h
@@ -200,7 +200,7 @@ typedef struct {
int *gm_nrx_small;
int *gm_nrx_large;
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
cfs_sysctl_table_header_t *gm_sysctl; /* sysctl interface */
#endif
} gmnal_tunables_t;
diff --git a/lnet/klnds/gmlnd/gmlnd_module.c b/lnet/klnds/gmlnd/gmlnd_module.c
index 0a082520d2c00dba4e65830ceb35347c73300969..94a44b1f7c57c849f6e0adb0cf59e3d574e72256 100644
--- a/lnet/klnds/gmlnd/gmlnd_module.c
+++ b/lnet/klnds/gmlnd/gmlnd_module.c
@@ -61,7 +61,7 @@ gmnal_tunables_t gmnal_tunables = {
.gm_nrx_large = &nrx_large,
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static cfs_sysctl_table_t gmnal_ctl_table[] = {
{
.ctl_name = 1,
@@ -141,7 +141,7 @@ gmnal_load(void)
int status;
CDEBUG(D_TRACE, "This is the gmnal module initialisation routine\n");
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
gmnal_tunables.gm_sysctl =
cfs_register_sysctl_table(gmnal_top_ctl_table, 0);
@@ -166,7 +166,7 @@ static void __exit
gmnal_unload(void)
{
gmnal_fini();
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
if (gmnal_tunables.gm_sysctl != NULL)
cfs_unregister_sysctl_table(gmnal_tunables.gm_sysctl);
#endif
diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h
index 777121fea33e781c4bbd80b2e15be51bb0077c4d..008d59d4afe16508726d1160a6bd0885acacb452 100644
--- a/lnet/klnds/iiblnd/iiblnd.h
+++ b/lnet/klnds/iiblnd/iiblnd.h
@@ -139,7 +139,7 @@ typedef struct
int *kib_peercredits; /* # concurrent sends to 1 peer */
int *kib_sd_retries; /* # concurrent sends to 1 peer */
int *kib_concurrent_sends; /* send work queue sizing */
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
cfs_sysctl_table_header_t *kib_sysctl; /* sysctl interface */
#endif
} kib_tunables_t;
diff --git a/lnet/klnds/iiblnd/iiblnd_cb.c b/lnet/klnds/iiblnd/iiblnd_cb.c
index 727ad159a9b840da40e692fcb2ca9575acd47b4c..22d2bfd307ffac4bba582c14108cdc09655c979e 100644
--- a/lnet/klnds/iiblnd/iiblnd_cb.c
+++ b/lnet/klnds/iiblnd/iiblnd_cb.c
@@ -525,7 +525,7 @@ kibnal_kvaddr_to_page (unsigned long vaddr)
LASSERT (page != NULL);
return page;
}
-#if CONFIG_HIGHMEM
+#ifdef CONFIG_HIGHMEM
if (vaddr >= PKMAP_BASE &&
vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE)) {
/* No highmem pages only used for bulk (kiov) I/O */
diff --git a/lnet/klnds/iiblnd/iiblnd_modparams.c b/lnet/klnds/iiblnd/iiblnd_modparams.c
index 32045c3c1ffbed2f239fabab398fd4e04ce2c1a9..908314112ceded7b03cd07764763e949fca0ec04 100644
--- a/lnet/klnds/iiblnd/iiblnd_modparams.c
+++ b/lnet/klnds/iiblnd/iiblnd_modparams.c
@@ -96,7 +96,7 @@ kib_tunables_t kibnal_tunables = {
.kib_concurrent_sends = &concurrent_sends,
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
/* NB max_size specified for proc_dostring entries only needs to be big enough
* not to truncate the printout; it only needs to be the actual size of the
diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index 5542bc0ce473ec5c46d91c9b96d85b9ffdbe7d6a..59335510e6befa268c18f1dc71768b700b25bb8c 100644
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -126,7 +126,7 @@ typedef struct
int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
int *kib_fmr_cache; /* enable FMR pool cache? */
#endif
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
cfs_sysctl_table_header_t *kib_sysctl; /* sysctl interface */
#endif
} kib_tunables_t;
diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index 35bb265c7d7c68b9ee54434c7f2e1e1d8680e96a..ce65801a2dfea9e984ac7690c9bfdabef6bff014 100644
--- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -109,7 +109,7 @@ kib_tunables_t kiblnd_tunables = {
#endif
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static char ipif_basename_space[32];
diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c
index 9975a91c32747453e308ccd60b6b9cfa78b811e8..a231e5ee981e3987656d2b551752b5f6dadb1192 100644
--- a/lnet/klnds/openiblnd/openiblnd_cb.c
+++ b/lnet/klnds/openiblnd/openiblnd_cb.c
@@ -427,7 +427,7 @@ kibnal_kvaddr_to_phys (unsigned long vaddr, __u64 *physp)
if (vaddr >= VMALLOC_START &&
vaddr < VMALLOC_END)
page = vmalloc_to_page ((void *)vaddr);
-#if CONFIG_HIGHMEM
+#ifdef CONFIG_HIGHMEM
else if (vaddr >= PKMAP_BASE &&
vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE))
page = vmalloc_to_page ((void *)vaddr);
diff --git a/lnet/klnds/openiblnd/openiblnd_modparams.c b/lnet/klnds/openiblnd/openiblnd_modparams.c
index 5e40f14194b3563e28559e6437f48a0c305b4523..027b716fadfa51de36f3245530e733763367b47c 100644
--- a/lnet/klnds/openiblnd/openiblnd_modparams.c
+++ b/lnet/klnds/openiblnd/openiblnd_modparams.c
@@ -81,7 +81,7 @@ kib_tunables_t kibnal_tunables = {
.kib_keepalive = &keepalive,
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static cfs_sysctl_table_t kibnal_ctl_table[] = {
{
diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index 3540749f1111f01e2f945effb000db030acc419a..2e6e8a49d24cf0dea9fc5c334b4d7345af67f310 100755
--- a/lnet/klnds/ptllnd/ptllnd.h
+++ b/lnet/klnds/ptllnd/ptllnd.h
@@ -100,7 +100,7 @@ typedef struct
int *kptl_simulation_bitmap;/* simulation bitmap */
#endif
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
cfs_sysctl_table_header_t *kptl_sysctl; /* sysctl interface */
#endif
} kptl_tunables_t;
diff --git a/lnet/klnds/ptllnd/ptllnd_modparams.c b/lnet/klnds/ptllnd/ptllnd_modparams.c
index c5bff41452e0d46b98495e9859ec8be9cd896492..7419e4faaad33f54a7201068681ae6598f3039bb 100644
--- a/lnet/klnds/ptllnd/ptllnd_modparams.c
+++ b/lnet/klnds/ptllnd/ptllnd_modparams.c
@@ -121,7 +121,7 @@ kptl_tunables_t kptllnd_tunables = {
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
#ifdef CRAY_XT3
static char ptltrace_basename_space[1024];
diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index b2d10da5deeb8a8f96a2fe24b5ba5af8da94367a..452959f7d013b47edbc7abf12fc7e2b1b679356e 100644
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -242,7 +242,7 @@ typedef struct
int *kqn_inject_csum_error; /* # csum errors to inject */
#endif
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
cfs_sysctl_table_header_t *kqn_sysctl; /* sysctl interface */
#endif
} kqswnal_tunables_t;
diff --git a/lnet/klnds/qswlnd/qswlnd_modparams.c b/lnet/klnds/qswlnd/qswlnd_modparams.c
index 03512c01b727b7f967eb91145818b282f43a63f2..8c92d7c49da0bdf154186318f3dd7066f01b5db1 100644
--- a/lnet/klnds/qswlnd/qswlnd_modparams.c
+++ b/lnet/klnds/qswlnd/qswlnd_modparams.c
@@ -83,7 +83,7 @@ kqswnal_tunables_t kqswnal_tunables = {
#endif
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static cfs_sysctl_table_t kqswnal_ctl_table[] = {
{
.ctl_name = 1,
diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.c b/lnet/klnds/socklnd/socklnd_lib-linux.c
index d4d12b77afce10ea4dc9268ffeccfb81ba6433ae..0689d9dfa6513cdbc114ee8ebfc775bb7b11fff4 100644
--- a/lnet/klnds/socklnd/socklnd_lib-linux.c
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.c
@@ -4,7 +4,7 @@
#include "socklnd.h"
-# if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+# if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static cfs_sysctl_table_t ksocknal_ctl_table[21];
cfs_sysctl_table_t ksocknal_top_ctl_table[] = {
@@ -129,7 +129,7 @@ ksocknal_lib_tunables_init ()
.mode = 0644,
.proc_handler = &proc_dointvec
};
-#if CPU_AFFINITY
+#ifdef CPU_AFFINITY
ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
.ctl_name = j++,
.procname = "irq_affinity",
@@ -227,7 +227,7 @@ ksocknal_lib_tunables_fini ()
void
ksocknal_lib_bind_irq (unsigned int irq)
{
-#if (defined(CONFIG_SMP) && CPU_AFFINITY)
+#if (defined(CONFIG_SMP) && defined(CPU_AFFINITY))
int bind;
int cpu;
char cmdline[64];
@@ -300,7 +300,7 @@ unsigned int
ksocknal_lib_sock_irq (struct socket *sock)
{
int irq = 0;
-#if CPU_AFFINITY
+#ifdef CPU_AFFINITY
struct dst_entry *dst;
if (!*ksocknal_tunables.ksnd_irq_affinity)
diff --git a/lnet/klnds/socklnd/socklnd_lib-winnt.c b/lnet/klnds/socklnd/socklnd_lib-winnt.c
index c51129b9cb2d1c84df9939ed82b58319bf8ffa27..545870714cb03b7f909b124fd1dba2e2c028de00 100755
--- a/lnet/klnds/socklnd/socklnd_lib-winnt.c
+++ b/lnet/klnds/socklnd/socklnd_lib-winnt.c
@@ -67,7 +67,7 @@ ksocknal_lib_tunables_init ()
ksocknal_ctl_table[i++] = (ctl_table)
{j++, "nagle", ksocknal_tunables.ksnd_nagle,
sizeof(int), 0644, NULL, &proc_dointvec};
-#if CPU_AFFINITY
+#ifdef CPU_AFFINITY
ksocknal_ctl_table[i++] = (ctl_table)
{j++, "irq_affinity", ksocknal_tunables.ksnd_irq_affinity,
sizeof(int), 0644, NULL, &proc_dointvec};
@@ -157,7 +157,7 @@ ksocknal_kvaddr_to_page (unsigned long vaddr)
if (vaddr >= VMALLOC_START &&
vaddr < VMALLOC_END)
page = vmalloc_to_page ((void *)vaddr);
-#if CONFIG_HIGHMEM
+#ifdef CONFIG_HIGHMEM
else if (vaddr >= PKMAP_BASE &&
vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE))
page = vmalloc_to_page ((void *)vaddr);
diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h
index ef9f670ea280d71c4715a2aa07777b140741ec89..2a254de718e2903a7f5e8a81dbb2cedbd40c7998 100644
--- a/lnet/klnds/viblnd/viblnd.h
+++ b/lnet/klnds/viblnd/viblnd.h
@@ -170,7 +170,7 @@ typedef struct
#if IBNAL_USE_FMR
int *kib_fmr_remaps; /* # FMR maps before unmap required */
#endif
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
cfs_sysctl_table_header_t *kib_sysctl; /* sysctl interface */
#endif
} kib_tunables_t;
@@ -565,11 +565,11 @@ kibnal_send_keepalive(kib_conn_t *conn)
#endif
#if IBNAL_VOIDSTAR_SGADDR
-# if CONFIG_HIGHMEM
-# if CONFIG_X86 && CONFIG_HIGHMEM4G
+# if defined(CONFIG_HIGHMEM)
+# if defined(CONFIG_X86) && defined(CONFIG_HIGHMEM4G)
/* truncation to void* doesn't matter if 0 <= physmem < 4G
* so allow x86 with 32 bit phys addrs */
-# elif CONFIG_IA64
+# elif defined(CONFIG_IA64)
/* OK anyway on 64-bit arch */
# else
# error "Can't support HIGHMEM when vv_scatgat_t::v_address is void *"
diff --git a/lnet/klnds/viblnd/viblnd_cb.c b/lnet/klnds/viblnd/viblnd_cb.c
index 60572b8de1d2bfd17a65133f049303f50720950a..3b05751d8be9985008e0879f970db17c64b37e4a 100644
--- a/lnet/klnds/viblnd/viblnd_cb.c
+++ b/lnet/klnds/viblnd/viblnd_cb.c
@@ -526,7 +526,7 @@ kibnal_kvaddr_to_page (unsigned long vaddr)
LASSERT (page != NULL);
return page;
}
-#if CONFIG_HIGHMEM
+#ifdef CONFIG_HIGHMEM
if (vaddr >= PKMAP_BASE &&
vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE)) {
/* No highmem pages only used for bulk (kiov) I/O */
diff --git a/lnet/klnds/viblnd/viblnd_modparams.c b/lnet/klnds/viblnd/viblnd_modparams.c
index d578bdea447c24a2f902d3c2881d2908baca515e..b7ab5d785dc6d6c9a5842306d9846e86c891d00c 100644
--- a/lnet/klnds/viblnd/viblnd_modparams.c
+++ b/lnet/klnds/viblnd/viblnd_modparams.c
@@ -125,7 +125,7 @@ kib_tunables_t kibnal_tunables = {
#endif
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static char hca_basename_space[32];
static char ipif_basename_space[32];
diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index bb6f58720fd82abd0080885335ff39af97372c89..356754b582c1f1ea8b6da2bd0bdb59a92f02d944 100644
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.c
@@ -624,8 +624,7 @@ srpc_finish_service (srpc_service_t *sv)
void
srpc_service_recycle_buffer (srpc_service_t *sv, srpc_buffer_t *buf)
{
- if (sv->sv_shuttingdown)
- goto free;
+ if (sv->sv_shuttingdown) goto free;
if (sv->sv_nprune == 0) {
if (srpc_service_post_buffer(sv, buf) != 0)
@@ -1548,8 +1547,7 @@ srpc_check_event (int timeout)
rc = LNetEQPoll(&srpc_data.rpc_lnet_eq, 1,
timeout * 1000, &ev, &i);
- if (rc == 0)
- return 0;
+ if (rc == 0) return 0;
LASSERT (rc == -EOVERFLOW || rc == 1);
@@ -1559,7 +1557,9 @@ srpc_check_event (int timeout)
abort();
}
+ LNET_LOCK();
srpc_lnet_ev_handler(&ev);
+ LNET_UNLOCK();
return 1;
}