From 954425b9ad83b1619ab9f647c421f2cf4f67b41c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 14 Jan 2022 11:16:47 +0100 Subject: [PATCH] btrfs: simplify scrub_repair_page_from_good_copy The I/O in repair_io_failue is synchronous and doesn't need a btrfs_bio, so just use an on-stack bio. Signed-off-by: Christoph Hellwig --- fs/btrfs/scrub.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index da2f5687828b..e7d4ed7d36c1 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -1543,7 +1543,8 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad, BUG_ON(spage_good->page == NULL); if (force_write || sblock_bad->header_error || sblock_bad->checksum_error || spage_bad->io_error) { - struct bio *bio; + struct bio bio; + struct bio_vec bvec; int ret; if (!spage_bad->dev->bdev) { @@ -1552,25 +1553,19 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad, return -EIO; } - bio = btrfs_bio_alloc(1); - bio_set_dev(bio, spage_bad->dev->bdev); - bio->bi_iter.bi_sector = spage_bad->physical >> 9; - bio->bi_opf = REQ_OP_WRITE; + bio_init(&bio, spage_bad->dev->bdev, &bvec, 1, REQ_OP_WRITE); + bio.bi_iter.bi_sector = spage_bad->physical >> 9; + __bio_add_page(&bio, spage_good->page, sectorsize, 0); - ret = bio_add_page(bio, spage_good->page, sectorsize, 0); - if (ret != sectorsize) { - bio_put(bio); - return -EIO; - } + ret = btrfsic_submit_bio_wait(&bio); + bio_uninit(&bio); - if (btrfsic_submit_bio_wait(bio)) { + if (ret) { btrfs_dev_stat_inc_and_print(spage_bad->dev, BTRFS_DEV_STAT_WRITE_ERRS); atomic64_inc(&fs_info->dev_replace.num_write_errors); - bio_put(bio); return -EIO; } - bio_put(bio); } return 0; -- 2.50.1