From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 20 May 2015 06:41:18 +0000 (+0800)
Subject: workqueue: remove the lock from wq_sysfs_prep_attrs()
X-Git-Tag: v4.2-rc1~82^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=899a94fe15a8e928277ff0d0402c086fa67fe16f;p=karo-tx-linux.git

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>
---

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;
 }