X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Fklnds%2Fqswlnd%2Fqswlnd.c;h=fa8e8f45e13ebaaa6f2e0f4055198531318e0a13;hb=48a0697d79101ad3ff7651779808dcf002a68890;hp=dcee1a8f067671748447a2b4d2671818ed889e8b;hpb=9c6ebfd11be1cc11629a2960c8c818492e1f0980;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/qswlnd/qswlnd.c b/lnet/klnds/qswlnd/qswlnd.c
index dcee1a8..fa8e8f4 100644
--- 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) {