Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8f5b395 authored Jul 13, 2017 by David Sterba

btrfs: btrfs_create_repair_bio never fails, skip error handling



As the function uses the non-failing bio allocation, we can remove error
handling from the callers as well.

Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent c09abff8

fs/btrfs/extent_io.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2394,10 +2394,6 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
		start - page_offset(page),
		(int)phy_offset, failed_bio->bi_end_io,
		NULL);
		if (!bio) {
		free_io_failure(failure_tree, tree, failrec);
		return -EIO;
		}
		bio_set_op_attrs(bio, REQ_OP_READ, read_mode);

		btrfs_debug(btrfs_sb(inode->i_sb),

fs/btrfs/inode.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -8017,10 +8017,6 @@ static int dio_read_error(struct inode inode, struct bio failed_bio,
		isector >>= inode->i_sb->s_blocksize_bits;
		bio = btrfs_create_repair_bio(inode, failed_bio, failrec, page,
		pgoff, isector, repair_endio, repair_arg);
		if (!bio) {
		free_io_failure(failure_tree, io_tree, failrec);
		return -EIO;
		}
		bio_set_op_attrs(bio, REQ_OP_READ, read_mode);

		btrfs_debug(BTRFS_I(inode)->root->fs_info,