LU-6020 kerberos: proper sg list initialization

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

diff --git a/lnet/klnds/qswlnd/qswlnd.c b/lnet/klnds/qswlnd/qswlnd.c
index dcee1a8..fa8e8f4 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.c
+++ b/lnet/klnds/qswlnd/qswlnd.c
@@ -144,9 +144,9 @@ kqswnal_shutdown(lnet_ni_t *ni)
 
        /**********************************************************************/
        /* wait for sends that have allocated a tx desc to launch or give up */
-       while (cfs_atomic_read (&kqswnal_data.kqn_pending_txs) != 0) {
+       while (atomic_read (&kqswnal_data.kqn_pending_txs) != 0) {
                CDEBUG(D_NET, "waiting for %d pending sends\n",
-                      cfs_atomic_read (&kqswnal_data.kqn_pending_txs));
+                      atomic_read (&kqswnal_data.kqn_pending_txs));
                cfs_pause(cfs_time_seconds(1));
        }
 
@@ -174,11 +174,11 @@ kqswnal_shutdown(lnet_ni_t *ni)
        /**********************************************************************/
        /* flag threads to terminate, wake them and wait for them to die */
        kqswnal_data.kqn_shuttingdown = 2;
-       cfs_waitq_broadcast (&kqswnal_data.kqn_sched_waitq);
+       wake_up_all (&kqswnal_data.kqn_sched_waitq);
 
-       while (cfs_atomic_read (&kqswnal_data.kqn_nthreads) != 0) {
+       while (atomic_read (&kqswnal_data.kqn_nthreads) != 0) {
                CDEBUG(D_NET, "waiting for %d threads to terminate\n",
-                      cfs_atomic_read (&kqswnal_data.kqn_nthreads));
+                      atomic_read (&kqswnal_data.kqn_nthreads));
                cfs_pause(cfs_time_seconds(1));
        }
 
@@ -252,9 +252,9 @@ kqswnal_shutdown(lnet_ni_t *ni)
        /* resets flags, pointers to NULL etc */
        memset(&kqswnal_data, 0, sizeof (kqswnal_data));
 
-       CDEBUG (D_MALLOC, "done kmem %d\n", cfs_atomic_read(&libcfs_kmemory));
+       CDEBUG (D_MALLOC, "done kmem %d\n", atomic_read(&libcfs_kmemory));
 
-       PORTAL_MODULE_UNUSE;
+       module_put(THIS_MODULE);
 }
 
 int
@@ -288,7 +288,7 @@ kqswnal_startup (lnet_ni_t *ni)
                                   *kqswnal_tunables.kqn_credits);
        }
         
-       CDEBUG (D_MALLOC, "start kmem %d\n", cfs_atomic_read(&libcfs_kmemory));
+       CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read(&libcfs_kmemory));
        
        /* ensure all pointers NULL etc */
        memset (&kqswnal_data, 0, sizeof (kqswnal_data));
@@ -307,11 +307,11 @@ kqswnal_startup (lnet_ni_t *ni)
        CFS_INIT_LIST_HEAD (&kqswnal_data.kqn_readyrxds);
 
        spin_lock_init(&kqswnal_data.kqn_sched_lock);
-       cfs_waitq_init (&kqswnal_data.kqn_sched_waitq);
+       init_waitqueue_head (&kqswnal_data.kqn_sched_waitq);
 
        /* pointers/lists/locks initialised */
        kqswnal_data.kqn_init = KQN_INIT_DATA;
-       PORTAL_MODULE_USE;
+       try_module_get(THIS_MODULE);
        
        kqswnal_data.kqn_ep = ep_system();
        if (kqswnal_data.kqn_ep == NULL) {