block: Simplify blk_zone_write_plug_bio_endio()

damien-lemoal · axboe · commit b5a64ec2ea2b · 2024-05-01T08:08:43.000-06:00
We already have the disk variable obtained from the bio when calling disk_get_zone_wplug(). So use that variable instead of dereferencing the bio bdev again for the disk argument of disk_get_zone_wplug(). 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-13-dlemoal@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
@@ -1222,8 +1222,7 @@ void blk_zone_write_plug_bio_endio(struct bio *bio)
 {
 	struct gendisk *disk = bio->bi_bdev->bd_disk;
 	struct blk_zone_wplug *zwplug =
-		disk_get_zone_wplug(bio->bi_bdev->bd_disk,
-				    bio->bi_iter.bi_sector);
+		disk_get_zone_wplug(disk, bio->bi_iter.bi_sector);
 	unsigned long flags;
 
 	if (WARN_ON_ONCE(!zwplug))

Original file line number	Diff line number	Diff line change
`@@ -1222,8 +1222,7 @@ void blk_zone_write_plug_bio_endio(struct bio *bio)`
`1222`	`1222`	`{`
`1223`	`1223`	`struct gendisk *disk = bio->bi_bdev->bd_disk;`
`1224`	`1224`	`struct blk_zone_wplug *zwplug =`
`1225`		`- disk_get_zone_wplug(bio->bi_bdev->bd_disk,`
`1226`		`- bio->bi_iter.bi_sector);`
	`1225`	`+ disk_get_zone_wplug(disk, bio->bi_iter.bi_sector);`
`1227`	`1226`	`unsigned long flags;`
`1228`	`1227`
`1229`	`1228`	`if (WARN_ON_ONCE(!zwplug))`