LU-1346 gnilnd: remove libcfs abstractions

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

diff --git a/lnet/klnds/qswlnd/qswlnd.c b/lnet/klnds/qswlnd/qswlnd.c
index d4b543c..e62b094 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.c
+++ b/lnet/klnds/qswlnd/qswlnd.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -61,7 +63,7 @@ kqswnal_get_tx_desc (struct libcfs_ioctl_data *data)
        int                index = data->ioc_count;
        int                rc = -ENOENT;
 
-       cfs_spin_lock_irqsave (&kqswnal_data.kqn_idletxd_lock, flags);
+       spin_lock_irqsave(&kqswnal_data.kqn_idletxd_lock, flags);
 
        cfs_list_for_each (tmp, &kqswnal_data.kqn_activetxds) {
                if (index-- != 0)
@@ -82,7 +84,7 @@ kqswnal_get_tx_desc (struct libcfs_ioctl_data *data)
                break;
        }
 
-       cfs_spin_unlock_irqrestore (&kqswnal_data.kqn_idletxd_lock, flags);
+       spin_unlock_irqrestore(&kqswnal_data.kqn_idletxd_lock, flags);
        return (rc);
 }
 
@@ -136,9 +138,9 @@ kqswnal_shutdown(lnet_ni_t *ni)
 
        /**********************************************************************/
        /* Signal the start of shutdown... */
-       cfs_spin_lock_irqsave(&kqswnal_data.kqn_idletxd_lock, flags);
+       spin_lock_irqsave(&kqswnal_data.kqn_idletxd_lock, flags);
        kqswnal_data.kqn_shuttingdown = 1;
-       cfs_spin_unlock_irqrestore(&kqswnal_data.kqn_idletxd_lock, flags);
+       spin_unlock_irqrestore(&kqswnal_data.kqn_idletxd_lock, flags);
 
        /**********************************************************************/
        /* wait for sends that have allocated a tx desc to launch or give up */
@@ -172,7 +174,7 @@ 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) {
                CDEBUG(D_NET, "waiting for %d threads to terminate\n",
@@ -252,7 +254,7 @@ kqswnal_shutdown(lnet_ni_t *ni)
 
        CDEBUG (D_MALLOC, "done kmem %d\n", cfs_atomic_read(&libcfs_kmemory));
 
-       PORTAL_MODULE_UNUSE;
+       module_put(THIS_MODULE);
 }
 
 int
@@ -298,18 +300,18 @@ kqswnal_startup (lnet_ni_t *ni)
 
        CFS_INIT_LIST_HEAD (&kqswnal_data.kqn_idletxds);
        CFS_INIT_LIST_HEAD (&kqswnal_data.kqn_activetxds);
-       cfs_spin_lock_init (&kqswnal_data.kqn_idletxd_lock);
+       spin_lock_init(&kqswnal_data.kqn_idletxd_lock);
 
        CFS_INIT_LIST_HEAD (&kqswnal_data.kqn_delayedtxds);
        CFS_INIT_LIST_HEAD (&kqswnal_data.kqn_donetxds);
        CFS_INIT_LIST_HEAD (&kqswnal_data.kqn_readyrxds);
 
-       cfs_spin_lock_init (&kqswnal_data.kqn_sched_lock);
-       cfs_waitq_init (&kqswnal_data.kqn_sched_waitq);
+       spin_lock_init(&kqswnal_data.kqn_sched_lock);
+       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) {
@@ -523,8 +525,9 @@ kqswnal_startup (lnet_ni_t *ni)
 
        /**********************************************************************/
        /* Spawn scheduling threads */
-       for (i = 0; i < cfs_num_online_cpus(); i++) {
-               rc = kqswnal_thread_start (kqswnal_scheduler, NULL);
+       for (i = 0; i < num_online_cpus(); i++) {
+               rc = kqswnal_thread_start(kqswnal_scheduler, NULL,
+                                         "kqswnal_sched");
                if (rc != 0)
                {
                        CERROR ("failed to spawn scheduling thread: %d\n", rc);