1 files changed, 2 insertions, 1 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 419d600e6637..1bf83a0df0f6 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -413,7 +413,7 @@ int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags)
                 smp_rmb();
 
                 wait_event(q->mq_freeze_wq,
-                           (atomic_read(&q->mq_freeze_depth) == 0 &&
+                           (!q->mq_freeze_depth &&
                             (pm || (blk_pm_request_resume(q),
                                     !blk_queue_pm_only(q)))) ||
                            blk_queue_dying(q));
@@ -503,6 +503,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
         spin_lock_init(&q->queue_lock);
 
         init_waitqueue_head(&q->mq_freeze_wq);
+        mutex_init(&q->mq_freeze_lock);
 
         /*
          * Init percpu_ref in atomic mode so that it's faster to shutdown.