[PATCH 4.4 18/38] workqueue: Move the position of debug_work_activate() in __queue_work()

[Greg Kroah-Hartman]

From: Zqiang <qiang.zh...@windriver.com>

[ Upstream commit 0687c66b5f666b5ad433f4e94251590d9bc9d10e ]

The debug_work_activate() is called on the premise that
the work can be inserted, because if wq be in WQ_DRAINING
status, insert work may be failed.

Fixes: e41e704bc4f4 ("workqueue: improve destroy_workqueue() debuggability")
Signed-off-by: Zqiang <qiang.zh...@windriver.com>
Reviewed-by: Lai Jiangshan <jiangshan...@gmail.com>
Signed-off-by: Tejun Heo <t...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 kernel/workqueue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 6b293804cd73..a2de597604e6 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1351,7 +1351,6 @@ static void __queue_work(int cpu, struct workqueue_struct 
*wq,
         */
        WARN_ON_ONCE(!irqs_disabled());
 
-       debug_work_activate(work);
 
        /* if draining, only works from the same workqueue are allowed */
        if (unlikely(wq->flags & __WQ_DRAINING) &&
@@ -1430,6 +1429,7 @@ retry:
                worklist = &pwq->delayed_works;
        }
 
+       debug_work_activate(work);
        insert_work(pwq, work, worklist, work_flags);
 
        spin_unlock(&pwq->pool->lock);
-- 
2.30.2