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

diff --git a/libcfs/libcfs/workitem.c b/libcfs/libcfs/workitem.c
index fb4fd64..d2b9eb4 100644
--- a/libcfs/libcfs/workitem.c
+++ b/libcfs/libcfs/workitem.c
@@ -23,11 +23,10 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * libcfs/libcfs/workitem.c
  *
@@ -126,8 +125,6 @@ cfs_wi_exit(struct cfs_wi_sched *sched, struct cfs_workitem *wi)
 
 	wi->wi_scheduled = 1; /* LBUG future schedule attempts */
 	spin_unlock(&sched->ws_lock);
-
-	return;
 }
 EXPORT_SYMBOL(cfs_wi_exit);
 
@@ -198,7 +195,6 @@ cfs_wi_schedule(struct cfs_wi_sched *sched, struct cfs_workitem *wi)
 
 	LASSERT (!list_empty(&wi->wi_list));
 	spin_unlock(&sched->ws_lock);
-	return;
 }
 EXPORT_SYMBOL(cfs_wi_schedule);
 
@@ -207,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)
@@ -313,14 +307,13 @@ cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
 		int i = 2;
 
 		while (sched->ws_nthreads > 0) {
-			CDEBUG(is_power_of_2(++i) ? D_WARNING : D_NET,
-			       "waiting for %d threads of WI sched[%s] to "
-			       "terminate\n", sched->ws_nthreads,
-			       sched->ws_name);
+			CDEBUG(is_power_of_2(++i / 20) ? D_WARNING : D_NET,
+			       "waiting %us for %d %s worker threads to exit\n",
+			       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);
 		}
 	}
@@ -389,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);
 
@@ -450,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);