blk-mq: move hctx lock/unlock into a helper

[mirror_ubuntu-bionic-kernel.git] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 870484eaed1f64b586ccb0fd4dd34c3f9462a29d..f1d563997d0ea03caed489558abfae65393d7486 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -808,6 +808,9 @@ static void __blk_release_queue(struct work_struct *work)
 
        blk_free_queue_stats(q->stats);
 
+       if (q->mq_ops)
+               cancel_delayed_work_sync(&q->requeue_work);
+
        blk_exit_rl(q, &q->root_rl);
 
        if (q->queue_tags)