block: Simplify zone write plug BIO abort
authorDamien Le Moal <dlemoal@kernel.org>
Wed, 1 May 2024 11:09:06 +0000 (20:09 +0900)
committerJens Axboe <axboe@kernel.dk>
Wed, 1 May 2024 14:08:43 +0000 (08:08 -0600)
commitc9c8aea03c4ac2ea902bc7dd5ba14f5d78af8ece
tree740f7396bd5cb8cdc05d09206f55b0aea09ffc13
parentb5a64ec2ea2be2a7f7eb73c243c2381e9fc1c71b
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>
block/blk-zoned.c