Skip to content

Commit

Permalink
btrfs: not a disk error if the bio_add_page fails
Browse files Browse the repository at this point in the history
bio_add_page() can fail for logical reasons as from the bio_add_page()
comments:

/*
 * This will only fail if either bio->bi_vcnt == bio->bi_max_vecs or
 * it's a cloned bio.
 */

Here we have just allocated the bio, so both of those failures can't
occur. So drop the check. We can also drop the error stats for write
error.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Anand Jain authored and David Sterba committed Mar 26, 2018
1 parent 4117f20 commit 7ef2d6a
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions fs/btrfs/scrub.c
Original file line number Diff line number Diff line change
Expand Up @@ -4620,7 +4620,6 @@ static int write_page_nocow(struct scrub_ctx *sctx,
{
struct bio *bio;
struct btrfs_device *dev;
int ret;

dev = sctx->wr_tgtdev;
if (!dev)
Expand All @@ -4635,17 +4634,15 @@ static int write_page_nocow(struct scrub_ctx *sctx,
bio->bi_iter.bi_sector = physical_for_dev_replace >> 9;
bio_set_dev(bio, dev->bdev);
bio->bi_opf = REQ_OP_WRITE | REQ_SYNC;
ret = bio_add_page(bio, page, PAGE_SIZE, 0);
if (ret != PAGE_SIZE) {
leave_with_eio:
/* bio_add_page won't fail on a freshly allocated bio */
bio_add_page(bio, page, PAGE_SIZE, 0);

if (btrfsic_submit_bio_wait(bio)) {
bio_put(bio);
btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS);
return -EIO;
}

if (btrfsic_submit_bio_wait(bio))
goto leave_with_eio;

bio_put(bio);
return 0;
}

0 comments on commit 7ef2d6a

Please sign in to comment.