Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-16202 build: bio_alloc takes struct block_device
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
workitem.c
diff --git
a/libcfs/libcfs/workitem.c
b/libcfs/libcfs/workitem.c
index
7768e5c
..
d2b9eb4
100644
(file)
--- a/
libcfs/libcfs/workitem.c
+++ b/
libcfs/libcfs/workitem.c
@@
-27,7
+27,6
@@
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* libcfs/libcfs/workitem.c
*
*
* libcfs/libcfs/workitem.c
*
@@
-204,8
+203,6
@@
cfs_wi_scheduler(void *arg)
{
struct cfs_wi_sched *sched = (struct cfs_wi_sched *)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)
/* 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);
i / 20, sched->ws_nthreads, sched->ws_name);
spin_unlock(&cfs_wi_data.wi_glock);
- s
et_current_state(TASK_UNINTERRUPTIBLE);
-
schedule_timeout(cfs_time_seconds(1)
/ 20);
+ s
chedule_timeout_uninterruptible(cfs_time_seconds(1)
+
/ 20);
spin_lock(&cfs_wi_data.wi_glock);
}
}
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);
}
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);
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);
while (sched->ws_nthreads != 0) {
spin_unlock(&cfs_wi_data.wi_glock);
- s
et_current_state(TASK_UNINTERRUPTIBLE);
-
schedule_timeout(cfs_time_seconds(1)
/ 20);
+ s
chedule_timeout_uninterruptible(cfs_time_seconds(1)
+
/ 20);
spin_lock(&cfs_wi_data.wi_glock);
}
spin_unlock(&cfs_wi_data.wi_glock);
spin_lock(&cfs_wi_data.wi_glock);
}
spin_unlock(&cfs_wi_data.wi_glock);