From: Christoph Hellwig Date: Sun, 19 Jun 2022 06:05:50 +0000 (+0200) Subject: block: stop setting the nomerges flags in blk_cleanup_queue X-Git-Tag: v6.1-rc5~616^2~55 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e3534022f26ae51f7cf28347a253230604b6f4e;p=platform%2Fkernel%2Flinux-starfive.git block: stop setting the nomerges flags in blk_cleanup_queue These flags only apply to file system I/O, and all file system I/O is already drained by del_gendisk and thus can't be in progress when blk_cleanup_queue is called. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Link: https://lore.kernel.org/r/20220619060552.1850436-5-hch@lst.de Signed-off-by: Jens Axboe --- diff --git a/block/blk-core.c b/block/blk-core.c index f86df39..04029ff 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -304,9 +304,6 @@ void blk_cleanup_queue(struct request_queue *q) blk_queue_flag_set(QUEUE_FLAG_DYING, q); blk_queue_start_drain(q); - blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q); - blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q); - /* * Drain all requests queued before DYING marking. Set DEAD flag to * prevent that blk_mq_run_hw_queues() accesses the hardware queues