X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fworkitem.c;h=d2b9eb4f871ea20503254647e07524066041c401;hb=737737562e463d3608b4b6f044b2e170a3fd80e7;hp=7768e5c9eb38a13dbf5652ee82c6d076a762eef7;hpb=b19b318b5e74e76b3fc5b15c796666d04df62466;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/workitem.c b/libcfs/libcfs/workitem.c
index 7768e5c..d2b9eb4 100644
--- a/libcfs/libcfs/workitem.c
+++ b/libcfs/libcfs/workitem.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * libcfs/libcfs/workitem.c
  *
@@ -204,8 +203,6 @@ cfs_wi_scheduler(void *arg)
 {
 	struct cfs_wi_sched *sched = (struct cfs_wi_sched *)arg;
 
-	cfs_block_allsigs();
-
 	/* CPT affinity scheduler? */
 	if (sched->ws_cptab != NULL)
 		if (cfs_cpt_bind(sched->ws_cptab, sched->ws_cpt) != 0)
@@ -315,8 +312,8 @@ cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
 			       i / 20, sched->ws_nthreads, sched->ws_name);
 
 			spin_unlock(&cfs_wi_data.wi_glock);
-			set_current_state(TASK_UNINTERRUPTIBLE);
-			schedule_timeout(cfs_time_seconds(1) / 20);
+			schedule_timeout_uninterruptible(cfs_time_seconds(1)
+							 / 20);
 			spin_lock(&cfs_wi_data.wi_glock);
 		}
 	}
@@ -385,7 +382,7 @@ cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab,
 				 sched->ws_name, sched->ws_nthreads);
 		}
 
-		task = kthread_run(cfs_wi_scheduler, sched, name);
+		task = kthread_run(cfs_wi_scheduler, sched, "%s", name);
 		if (IS_ERR(task)) {
 			int rc = PTR_ERR(task);
 
@@ -446,8 +443,8 @@ cfs_wi_shutdown (void)
 
 		while (sched->ws_nthreads != 0) {
 			spin_unlock(&cfs_wi_data.wi_glock);
-			set_current_state(TASK_UNINTERRUPTIBLE);
-			schedule_timeout(cfs_time_seconds(1) / 20);
+			schedule_timeout_uninterruptible(cfs_time_seconds(1)
+							 / 20);
 			spin_lock(&cfs_wi_data.wi_glock);
 		}
 		spin_unlock(&cfs_wi_data.wi_glock);