X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd.c;h=14fb5d6125f5a9e2c8b1625451ecb0d8a60d64d9;hp=8b5bc2e77c73b6bad14b303ca5d4a51803e89e9d;hb=5c883ea2748ae9e430a9cd863a9b630b2a74440a;hpb=f2d06d3c76a1d69447e7bd6fd29d8165be558d73;ds=sidebyside

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index 8b5bc2e..14fb5d6 100644
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -1598,8 +1598,7 @@ kgnilnd_del_conn_or_peer(kgn_net_t *net, lnet_nid_t nid, int command,
 	       atomic_read(&kgnilnd_data.kgn_npending_detach)  ||
 	       atomic_read(&kgnilnd_data.kgn_npending_unlink)) {
 
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(cfs_time_seconds(1));
+		schedule_timeout_uninterruptible(cfs_time_seconds(1));
 		i++;
 
 		CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, "Waiting on %d peers %d closes %d detaches\n",
@@ -2464,8 +2463,7 @@ kgnilnd_base_shutdown(void)
 
 		CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET,
 			"Waiting for conns to be cleaned up %d\n",atomic_read(&kgnilnd_data.kgn_nconns));
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(cfs_time_seconds(1));
+		schedule_timeout_uninterruptible(cfs_time_seconds(1));
 	}
 	/* Peer state all cleaned up BEFORE setting shutdown, so threads don't
 	 * have to worry about shutdown races.  NB connections may be created
@@ -2484,8 +2482,7 @@ kgnilnd_base_shutdown(void)
 		i++;
 		CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET,
 		       "Waiting for ruhroh thread to terminate\n");
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(cfs_time_seconds(1));
+		schedule_timeout_uninterruptible(cfs_time_seconds(1));
 	}
 
        /* Flag threads to terminate */
@@ -2517,8 +2514,7 @@ kgnilnd_base_shutdown(void)
 		CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, /* power of 2? */
 		       "Waiting for %d threads to terminate\n",
 		       atomic_read(&kgnilnd_data.kgn_nthreads));
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(cfs_time_seconds(1));
+		schedule_timeout_uninterruptible(cfs_time_seconds(1));
 	}
 
 	LASSERTF(atomic_read(&kgnilnd_data.kgn_npeers) == 0,
@@ -2769,8 +2765,7 @@ kgnilnd_shutdown(struct lnet_ni *ni)
 				"Waiting for %d references to clear on net %d\n",
 				atomic_read(&net->gnn_refcount),
 				net->gnn_netnum);
-			set_current_state(TASK_UNINTERRUPTIBLE);
-			schedule_timeout(cfs_time_seconds(1));
+			schedule_timeout_uninterruptible(cfs_time_seconds(1));
 		}
 
 		/* release ref from kgnilnd_startup */