1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 6b9b0dc3dea5..0c329a6f0c51 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -159,6 +159,7 @@ struct worker_pool {
 
         /* see manage_workers() for details on the two manager mutexes */
         struct mutex            manager_arb;    /* manager arbitration */
+        struct worker           *manager;       /* L: purely informational */
         struct mutex            attach_mutex;   /* attach/detach exclusion */
         struct list_head        workers;        /* A: attached workers */
         struct completion       *detach_completion; /* all workers detached */
@@ -1918,9 +1919,11 @@ static bool manage_workers(struct worker *worker)
          */
         if (!mutex_trylock(&pool->manager_arb))
                 return false;
+        pool->manager = worker;
 
         maybe_create_worker(pool);
 
+        pool->manager = NULL;
         mutex_unlock(&pool->manager_arb);
         return true;
 }
@@ -2310,6 +2313,7 @@ repeat:
 struct wq_barrier {
         struct work_struct      work;
         struct completion       done;
+        struct task_struct      *task;  /* purely informational */
 };
 
 static void wq_barrier_func(struct work_struct *work)
@@ -2358,6 +2362,7 @@ static void insert_wq_barrier(struct pool_workqueue *pwq,
         INIT_WORK_ONSTACK(&barr->work, wq_barrier_func);
         __set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(&barr->work));
         init_completion(&barr->done);
+        barr->task = current;
 
         /*
          * If @target is currently being executed, schedule the