1 files changed, 5 insertions, 18 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index a2dccfe1acec..1070b21ba4aa 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2491,15 +2491,8 @@ 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));
 
-        /*
-         * Explicitly init the crosslock for wq_barrier::done, make its lock
-         * key a subkey of the corresponding work. As a result we won't
-         * build a dependency between wq_barrier::done and unrelated work.
-         */
-        lockdep_init_map_crosslock((struct lockdep_map *)&barr->done.map,
-                                   "(complete)wq_barr::done",
-                                   target->lockdep_map.key, 1);
-        __init_completion(&barr->done);
+        init_completion_map(&barr->done, &target->lockdep_map);
+
         barr->task = current;
 
         /*
@@ -2605,16 +2598,13 @@ void flush_workqueue(struct workqueue_struct *wq)
         struct wq_flusher this_flusher = {
                 .list = LIST_HEAD_INIT(this_flusher.list),
                 .flush_color = -1,
-                .done = COMPLETION_INITIALIZER_ONSTACK(this_flusher.done),
+                .done = COMPLETION_INITIALIZER_ONSTACK_MAP(this_flusher.done, wq->lockdep_map),
         };
         int next_color;
 
         if (WARN_ON(!wq_online))
                 return;
 
-        lock_map_acquire(&wq->lockdep_map);
-        lock_map_release(&wq->lockdep_map);
-
         mutex_lock(&wq->mutex);
 
         /*
@@ -2877,9 +2867,6 @@ bool flush_work(struct work_struct *work)
         if (WARN_ON(!wq_online))
                 return false;
 
-        lock_map_acquire(&work->lockdep_map);
-        lock_map_release(&work->lockdep_map);
-
         if (start_flush_work(work, &barr)) {
                 wait_for_completion(&barr.done);
                 destroy_work_on_stack(&barr.work);
@@ -4640,7 +4627,7 @@ static void rebind_workers(struct worker_pool *pool)
                  * concurrency management.  Note that when or whether
                  * @worker clears REBOUND doesn't affect correctness.
                  *
-                 * ACCESS_ONCE() is necessary because @worker->flags may be
+                 * WRITE_ONCE() is necessary because @worker->flags may be
                  * tested without holding any lock in
                  * wq_worker_waking_up().  Without it, NOT_RUNNING test may
                  * fail incorrectly leading to premature concurrency
@@ -4649,7 +4636,7 @@ static void rebind_workers(struct worker_pool *pool)
                 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
                 worker_flags |= WORKER_REBOUND;
                 worker_flags &= ~WORKER_UNBOUND;
-                ACCESS_ONCE(worker->flags) = worker_flags;
+                WRITE_ONCE(worker->flags, worker_flags);
         }
 
         spin_unlock_irq(&pool->lock);