i=liangzhen

-   replace #if with #ifdef when checking config macros.
-   srpc_lnet_ev_handler expects LNET_LOCK to be held.

diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h
index 37dd75c..be0f404 100644 (file)
--- 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;
 
         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;
         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 0a08252..94a44b1 100644 (file)
--- 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,
 };
 
         .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,
 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");
 
         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);
 
         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();
 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
         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 777121f..008d59d 100644 (file)
--- 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 */
         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;
         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 727ad15..22d2bfd 100644 (file)
--- 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;
         }
                 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 */
         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 32045c3..9083141 100644 (file)
--- 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,
 };
 
         .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
 
 /* 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 5542bc0..5933551 100644 (file)
--- 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
         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;
         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 35bb265..ce65801 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -109,7 +109,7 @@ kib_tunables_t kiblnd_tunables = {
 #endif
 };
 
 #endif
 };
 

-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM

 
 static char ipif_basename_space[32];
 
 
 static char ipif_basename_space[32];
 

diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c
index 9975a91..a231e5e 100644 (file)
--- 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 (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);
         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 5e40f14..027b716 100644 (file)
--- 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,
 };
 
         .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[] = {
         {
 
 static cfs_sysctl_table_t kibnal_ctl_table[] = {
         {

diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index 3540749..2e6e8a4 100755 (executable)
--- 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
 
         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;
         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 c5bff41..7419e4f 100644 (file)
--- 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];
 
 #ifdef CRAY_XT3
 static char ptltrace_basename_space[1024];
 

diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index b2d10da..452959f 100644 (file)
--- 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
 
         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;
         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 03512c0..8c92d7c 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd_modparams.c
+++ b/lnet/klnds/qswlnd/qswlnd_modparams.c
@@ -83,7 +83,7 @@ kqswnal_tunables_t kqswnal_tunables = {
 #endif
 };
 
 #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,
 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 d4d12b7..0689d9d 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib-linux.c
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.c
@@ -4,7 +4,7 @@
 
 #include "socklnd.h"
 
 
 #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[] = {
 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
         };
                 .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",
         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)
 {
 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];
         int              bind;
         int              cpu;
         char             cmdline[64];


@@ -300,7 +300,7 @@ unsigned int
 ksocknal_lib_sock_irq (struct socket *sock)
 {
         int                irq = 0;
 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)
         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 c51129b..5458707 100755 (executable)
--- 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};
         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};
         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 (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);
         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 ef9f670..2a254de 100644 (file)
--- 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 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;
         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
 #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 */
    /* 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 *"
    /* 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 60572b8..3b05751 100644 (file)
--- 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;
         }
                 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 */
         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 d578bde..b7ab5d7 100644 (file)
--- a/lnet/klnds/viblnd/viblnd_modparams.c
+++ b/lnet/klnds/viblnd/viblnd_modparams.c
@@ -125,7 +125,7 @@ kib_tunables_t kibnal_tunables = {
 #endif
 };
 
 #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];
 
 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 bb6f587..356754b 100644 (file)
--- 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)
 {
 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)
 
         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);
 
         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);
         
         
         LASSERT (rc == -EOVERFLOW || rc == 1);
         


@@ -1559,7 +1557,9 @@ srpc_check_event (int timeout)
                 abort();
         }
                 
                 abort();
         }
                 

+        LNET_LOCK();

         srpc_lnet_ev_handler(&ev);
         srpc_lnet_ev_handler(&ev);

+        LNET_UNLOCK();

         return 1;
 }
 
         return 1;
 }