Commit 760aa181 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

btrfs: use bdev_rw_virt in scrub_one_super 



Replace the code building a bio from a kernel direct map address and
submitting it synchronously with the bdev_rw_virt helper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Link: https://lore.kernel.org/r/20250507120451.4000627-19-hch@lst.de


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

fs/btrfs/scrub.c

+2 −8
Original line number Diff line number Diff line
@@ -2770,17 +2770,11 @@ static int scrub_one_super(struct scrub_ctx *sctx, struct btrfs_device *dev, 
			   struct page *page, u64 physical, u64 generation)

{

	struct btrfs_fs_info *fs_info = sctx->fs_info;

	struct bio_vec bvec;

	struct bio bio;

	struct btrfs_super_block *sb = page_address(page);

	int ret;



	bio_init(&bio, dev->bdev, &bvec, 1, REQ_OP_READ);

	bio.bi_iter.bi_sector = physical >> SECTOR_SHIFT;

	__bio_add_page(&bio, page, BTRFS_SUPER_INFO_SIZE, 0);

	ret = submit_bio_wait(&bio);

	bio_uninit(&bio);



	ret = bdev_rw_virt(dev->bdev, physical >> SECTOR_SHIFT, sb,

			BTRFS_SUPER_INFO_SIZE, REQ_OP_READ);

	if (ret < 0)

		return ret;

	ret = btrfs_check_super_csum(fs_info, sb);