summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2015-05-20 14:41:18 +0800
committerTejun Heo <tj@kernel.org>2015-05-21 17:26:22 -0400
commit899a94fe15a8e928277ff0d0402c086fa67fe16f (patch)
treeef82ff159b3fffde2c76f6502f0ce82f5896b954 /kernel
parentda7f91b2e2c6176f95ca7b538d74dc70c5d11ded (diff)
downloadlinux-stable-899a94fe15a8e928277ff0d0402c086fa67fe16f.tar.gz
linux-stable-899a94fe15a8e928277ff0d0402c086fa67fe16f.tar.bz2
linux-stable-899a94fe15a8e928277ff0d0402c086fa67fe16f.zip
workqueue: remove the lock from wq_sysfs_prep_attrs()
Reading to wq->unbound_attrs requires protection of either wq_pool_mutex or wq->mutex, and wq_sysfs_prep_attrs() is called with wq_pool_mutex held, so we don't need to grab wq->mutex here. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index bd4b24d3489d..ad8dc2b9efc3 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4937,13 +4937,13 @@ static struct workqueue_attrs *wq_sysfs_prep_attrs(struct workqueue_struct *wq)
{
struct workqueue_attrs *attrs;
+ lockdep_assert_held(&wq_pool_mutex);
+
attrs = alloc_workqueue_attrs(GFP_KERNEL);
if (!attrs)
return NULL;
- mutex_lock(&wq->mutex);
copy_workqueue_attrs(attrs, wq->unbound_attrs);
- mutex_unlock(&wq->mutex);
return attrs;
}