Commit fc8ac3e5 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Jens Axboe
Browse files

dm: dm-zoned: use __bio_add_page for adding single metadata page 



dm-zoned uses bio_add_page() for adding a single page to a freshly created
metadata bio.

Use __bio_add_page() instead as adding a single page to a new bio is
always guaranteed to succeed.

This brings us a step closer to marking bio_add_page() __must_check

Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/55a0c8dad7550379647873b579dc7cfbe0191f96.1685532726.git.johannes.thumshirn@wdc.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8f11f79f

drivers/md/dm-zoned-metadata.c

+3 −3
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static struct dmz_mblock *dmz_get_mblock_slow(struct dmz_metadata *zmd, 
	bio->bi_iter.bi_sector = dmz_blk2sect(block);

	bio->bi_private = mblk;

	bio->bi_end_io = dmz_mblock_bio_end_io;

	bio_add_page(bio, mblk->page, DMZ_BLOCK_SIZE, 0);

	__bio_add_page(bio, mblk->page, DMZ_BLOCK_SIZE, 0);

	submit_bio(bio);



	return mblk;
@@ -728,7 +728,7 @@ static int dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk, 
	bio->bi_iter.bi_sector = dmz_blk2sect(block);

	bio->bi_private = mblk;

	bio->bi_end_io = dmz_mblock_bio_end_io;

	bio_add_page(bio, mblk->page, DMZ_BLOCK_SIZE, 0);

	__bio_add_page(bio, mblk->page, DMZ_BLOCK_SIZE, 0);

	submit_bio(bio);



	return 0;
@@ -752,7 +752,7 @@ static int dmz_rdwr_block(struct dmz_dev *dev, enum req_op op, 
	bio = bio_alloc(dev->bdev, 1, op | REQ_SYNC | REQ_META | REQ_PRIO,

			GFP_NOIO);

	bio->bi_iter.bi_sector = dmz_blk2sect(block);

	bio_add_page(bio, page, DMZ_BLOCK_SIZE, 0);

	__bio_add_page(bio, page, DMZ_BLOCK_SIZE, 0);

	ret = submit_bio_wait(bio);

	bio_put(bio);