LU-6001 build: fix autoconf DLC detection output

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd.c

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index fe99809..cb9bf24 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -1874,7 +1874,10 @@ kgnilnd_query(lnet_ni_t *ni, lnet_nid_t nid, cfs_time_t *when)
        kgn_tx_t                *tx;
        kgn_peer_t              *peer = NULL;
        kgn_conn_t              *conn = NULL;
-       lnet_process_id_t       id = {.nid = nid, .pid = LUSTRE_SRV_LNET_PID};
+       lnet_process_id_t       id = {
+               .nid = nid,
+               .pid = LNET_PID_LUSTRE,
+       };
        ENTRY;
 
        /* I expect to find him, so only take a read lock */
@@ -2170,7 +2173,7 @@ int kgnilnd_base_startup(void)
                INIT_LIST_HEAD(&dev->gnd_map_tx);
                INIT_LIST_HEAD(&dev->gnd_fma_buffs);
                mutex_init(&dev->gnd_cq_mutex);
-               sema_init(&dev->gnd_fmablk_sem, 1);
+               mutex_init(&dev->gnd_fmablk_mutex);
                spin_lock_init(&dev->gnd_fmablk_lock);
                init_waitqueue_head(&dev->gnd_waitq);
                init_waitqueue_head(&dev->gnd_dgram_waitq);
@@ -2218,7 +2221,7 @@ int kgnilnd_base_startup(void)
        init_waitqueue_head(&kgnilnd_data.kgn_ruhroh_waitq);
        spin_lock_init(&kgnilnd_data.kgn_reaper_lock);
 
-       sema_init(&kgnilnd_data.kgn_quiesce_sem, 1);
+       mutex_init(&kgnilnd_data.kgn_quiesce_mutex);
        atomic_set(&kgnilnd_data.kgn_nquiesce, 0);
        atomic_set(&kgnilnd_data.kgn_npending_conns, 0);
        atomic_set(&kgnilnd_data.kgn_npending_unlink, 0);
@@ -2613,7 +2616,7 @@ kgnilnd_startup(lnet_ni_t *ni)
        }
 
        /* Serialize with shutdown. */
-       down(&kgnilnd_data.kgn_quiesce_sem);
+       mutex_lock(&kgnilnd_data.kgn_quiesce_mutex);
 
        LIBCFS_ALLOC(net, sizeof(*net));
        if (net == NULL) {
@@ -2680,10 +2683,10 @@ kgnilnd_startup(lnet_ni_t *ni)
 
        /* we need a separate thread to call probe_wait_by_id until
         * we get a function callback notifier from kgni */
-       up(&kgnilnd_data.kgn_quiesce_sem);
+       mutex_unlock(&kgnilnd_data.kgn_quiesce_mutex);
        RETURN(0);
  failed:
-       up(&kgnilnd_data.kgn_quiesce_sem);
+       mutex_unlock(&kgnilnd_data.kgn_quiesce_mutex);
        kgnilnd_shutdown(ni);
        RETURN(rc);
 }
@@ -2702,7 +2705,7 @@ kgnilnd_shutdown(lnet_ni_t *ni)
                "init %d\n", kgnilnd_data.kgn_init);
 
        /* Serialize with startup. */
-       down(&kgnilnd_data.kgn_quiesce_sem);
+       mutex_lock(&kgnilnd_data.kgn_quiesce_mutex);
        CDEBUG(D_MALLOC, "before NAL cleanup: kmem %d\n",
               atomic_read(&libcfs_kmemory));
 
@@ -2785,7 +2788,7 @@ out:
        CDEBUG(D_MALLOC, "after NAL cleanup: kmem %d\n",
               atomic_read(&libcfs_kmemory));
 
-       up(&kgnilnd_data.kgn_quiesce_sem);
+       mutex_unlock(&kgnilnd_data.kgn_quiesce_mutex);
        EXIT;
 }