From: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Date: Mon, 9 Mar 2020 21:41:35 +0000 (+0100)
Subject: block: remove redundant setting of QUEUE_FLAG_DYING
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fc4cc772102511de90e708e72754800686aa0043;p=linux.git

block: remove redundant setting of QUEUE_FLAG_DYING

Previously, blk_cleanup_queue has called blk_set_queue_dying to set the
flag, no need to do it again.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-core.c b/block/blk-core.c
index 9a78f62285f98..74edcadd67471 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -346,7 +346,6 @@ void blk_cleanup_queue(struct request_queue *q)
 
 	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q);
 	blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q);
-	blk_queue_flag_set(QUEUE_FLAG_DYING, q);
 
 	/*
 	 * Drain all requests queued before DYING marking. Set DEAD flag to