From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Ming Lei <ming.lei@redhat.com>, linux-block@vger.kernel.org
Subject: [PATCH 4/6] block: stop setting the nomerges flags in blk_cleanup_queue
Date: Sun, 19 Jun 2022 08:05:50 +0200 [thread overview]
Message-ID: <20220619060552.1850436-5-hch@lst.de> (raw)
In-Reply-To: <20220619060552.1850436-1-hch@lst.de>
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 <hch@lst.de>
---
block/blk-core.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 088332984cd1b..2f418606e3bd3 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
--
2.30.2
next prev parent reply other threads:[~2022-06-19 6:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-19 6:05 fully tear down the queue in del_gendisk Christoph Hellwig
2022-06-19 6:05 ` [PATCH 1/6] mtip32xx: remove the device_status debugfs file Christoph Hellwig
2022-06-20 8:37 ` Hannes Reinecke
2022-06-19 6:05 ` [PATCH 2/6] mtip32xx: fix device removal Christoph Hellwig
2022-06-20 8:38 ` Hannes Reinecke
2022-06-19 6:05 ` [PATCH 3/6] block: remove QUEUE_FLAG_DEAD Christoph Hellwig
2022-06-19 14:07 ` Bart Van Assche
2022-06-20 6:20 ` Christoph Hellwig
2022-06-20 8:39 ` Hannes Reinecke
2022-06-19 6:05 ` Christoph Hellwig [this message]
2022-06-20 8:40 ` [PATCH 4/6] block: stop setting the nomerges flags in blk_cleanup_queue Hannes Reinecke
2022-06-19 6:05 ` [PATCH 5/6] block: simplify disk shutdown Christoph Hellwig
2022-06-20 8:47 ` Hannes Reinecke
2022-06-19 6:05 ` [PATCH 6/6] block: remove blk_cleanup_disk Christoph Hellwig
2022-06-20 8:49 ` Hannes Reinecke
2022-06-20 8:56 ` Christoph Hellwig
2022-06-20 9:00 ` Hannes Reinecke
2022-06-28 14:42 ` Sagi Grimberg
2022-06-19 22:21 ` fully tear down the queue in del_gendisk Jens Axboe
2022-06-20 6:09 ` Christoph Hellwig
2022-06-20 11:16 ` Jens Axboe
2022-06-28 5:11 ` Christoph Hellwig
2022-06-28 12:29 ` Jens Axboe
2022-06-28 12:35 ` Jens Axboe
2022-06-28 12:33 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220619060552.1850436-5-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox