block: Simplify zone write plug BIO abort

When BIOs plugged in a zone write plug are aborted,
blk_zone_wplug_bio_io_error() clears the BIO BIO_ZONE_WRITE_PLUGGING
flag so that bio_io_error(bio) does not end up calling
blk_zone_write_plug_bio_endio() and we thus need to manually drop the
reference on the zone write plug held by the aborted BIO.

Move the call to disk_put_zone_wplug() that is alwasy following the call
to blk_zone_wplug_bio_io_error() inside that function to simplify the
code.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20240501110907.96950-14-dlemoal@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 132eb988f4d7d9176aedce7acc86b3f0f0c8ae49..15e4e14e16f7b758eaef5c77342a5f78dd0b89d5 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -634,12 +634,14 @@ again:
        return zwplug;
 }
 
-static inline void blk_zone_wplug_bio_io_error(struct bio *bio)
+static inline void blk_zone_wplug_bio_io_error(struct blk_zone_wplug *zwplug,
+                                              struct bio *bio)
 {
-       struct request_queue *q = bio->bi_bdev->bd_disk->queue;
+       struct request_queue *q = zwplug->disk->queue;
 
        bio_clear_flag(bio, BIO_ZONE_WRITE_PLUGGING);
        bio_io_error(bio);
+       disk_put_zone_wplug(zwplug);
        blk_queue_exit(q);
 }
 
@@ -650,10 +652,8 @@ static void disk_zone_wplug_abort(struct blk_zone_wplug *zwplug)
 {
        struct bio *bio;
 
-       while ((bio = bio_list_pop(&zwplug->bio_list))) {
-               blk_zone_wplug_bio_io_error(bio);
-               disk_put_zone_wplug(zwplug);
-       }
+       while ((bio = bio_list_pop(&zwplug->bio_list)))
+               blk_zone_wplug_bio_io_error(zwplug, bio);
 }
 
 /*
@@ -673,8 +673,7 @@ static void disk_zone_wplug_abort_unaligned(struct gendisk *disk,
                if (wp_offset >= zone_capacity ||
                    (bio_op(bio) != REQ_OP_ZONE_APPEND &&
                     bio_offset_from_zone_start(bio) != wp_offset)) {
-                       blk_zone_wplug_bio_io_error(bio);
-                       disk_put_zone_wplug(zwplug);
+                       blk_zone_wplug_bio_io_error(zwplug, bio);
                        continue;
                }