From: Damien Le Moal <dlemoal@kernel.org>
To: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
dm-devel@lists.linux.dev, Mike Snitzer <snitzer@redhat.com>
Subject: [PATCH v2 08/14] block: Fix flush request sector restore
Date: Wed, 1 May 2024 09:09:29 +0900 [thread overview]
Message-ID: <20240501000935.100534-9-dlemoal@kernel.org> (raw)
In-Reply-To: <20240501000935.100534-1-dlemoal@kernel.org>
Make sure that a request bio is not NULL before trying to restore the
request start sector.
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Fixes: 6f8fd758de63 ("block: Restore sector of flush requests")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
block/blk-flush.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 2f58ae018464..c17cf8ed8113 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -130,7 +130,8 @@ static void blk_flush_restore_request(struct request *rq)
* original @rq->bio. Restore it.
*/
rq->bio = rq->biotail;
- rq->__sector = rq->bio->bi_iter.bi_sector;
+ if (rq->bio)
+ rq->__sector = rq->bio->bi_iter.bi_sector;
/* make @rq a normal request */
rq->rq_flags &= ~RQF_FLUSH_SEQ;
--
2.44.0
next prev parent reply other threads:[~2024-05-01 0:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-01 0:09 [PATCH v2 00/14] Zone write plugging fixes and cleanup Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 01/14] dm: Check that a zoned table leads to a valid mapped device Damien Le Moal
2024-05-01 3:07 ` Benjamin Marzinski
2024-05-01 9:14 ` Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 02/14] block: Exclude conventional zones when faking max open limit Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 03/14] block: Fix zone write plug initialization from blk_revalidate_zone_cb() Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 04/14] block: Fix reference counting for zone write plugs in error state Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 05/14] block: Hold a reference on zone write plugs to schedule submission Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 06/14] block: Unhash a zone write plug only if needed Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 07/14] block: Do not remove zone write plugs still in use Damien Le Moal
2024-05-01 0:09 ` Damien Le Moal [this message]
2024-05-01 0:09 ` [PATCH v2 09/14] block: Fix handling of non-empty flush write requests to zones Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 10/14] block: Improve blk_zone_write_plug_bio_merged() Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 11/14] block: Improve zone write request completion handling Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 12/14] block: Simplify blk_zone_write_plug_bio_endio() Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 13/14] block: Simplify zone write plug BIO abort Damien Le Moal
2024-05-01 0:09 ` [PATCH v2 14/14] block: Cleanup blk_revalidate_zone_cb() Damien Le Moal
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=20240501000935.100534-9-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=axboe@kernel.dk \
--cc=dm-devel@lists.linux.dev \
--cc=linux-block@vger.kernel.org \
--cc=snitzer@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).