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

Commit bc243704 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.13-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fixes from David Sterba:
 "We've identified and fixed a silent corruption (introduced by code in
  the first pull), a fixup after the blk_status_t merge and two fixes to
  incremental send that Filipe has been hunting for some time"

* 'for-4.13-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix unexpected return value of bio_readpage_error
  btrfs: btrfs_create_repair_bio never fails, skip error handling
  btrfs: cloned bios must not be iterated by bio_for_each_segment_all
  Btrfs: fix write corruption due to bio cloning on raid5/6
  Btrfs: incremental send, fix invalid memory access
  Btrfs: incremental send, fix invalid path for link commands
parents 0ffff118 c3cfb656

fs/btrfs/compression.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static void end_compressed_bio_read(struct bio *bio) 
		 * we have verified the checksum already, set page

		 * checked so the end_io handlers know about it

		 */

		ASSERT(!bio_flagged(bio, BIO_CLONED));

		bio_for_each_segment_all(bvec, cb->orig_bio, i)

			SetPageChecked(bvec->bv_page);

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -964,6 +964,7 @@ static blk_status_t btree_csum_one_bio(struct bio *bio) 
	struct btrfs_root *root;

	int i, ret = 0;



	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, i) {

		root = BTRFS_I(bvec->bv_page->mapping->host)->root;

		ret = csum_dirty_buffer(root->fs_info, bvec->bv_page);

fs/btrfs/extent_io.c

+9 −10
Original line number Diff line number Diff line
@@ -2258,7 +2258,7 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end, 
	return 0;

}



int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio,

bool btrfs_check_repairable(struct inode *inode, struct bio *failed_bio,

			   struct io_failure_record *failrec, int failed_mirror)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
@@ -2274,7 +2274,7 @@ int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio, 
		btrfs_debug(fs_info,

			"Check Repairable: cannot repair, num_copies=%d, next_mirror %d, failed_mirror %d",

			num_copies, failrec->this_mirror, failed_mirror);

		return 0;

		return false;

	}



	/*
@@ -2315,10 +2315,10 @@ int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio, 
		btrfs_debug(fs_info,

			"Check Repairable: (fail) num_copies=%d, next_mirror %d, failed_mirror %d",

			num_copies, failrec->this_mirror, failed_mirror);

		return 0;

		return false;

	}



	return 1;

	return true;

}
@@ -2382,8 +2382,8 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, 
	if (ret)

		return ret;



	ret = btrfs_check_repairable(inode, failed_bio, failrec, failed_mirror);

	if (!ret) {

	if (!btrfs_check_repairable(inode, failed_bio, failrec,

				    failed_mirror)) {

		free_io_failure(failure_tree, tree, failrec);

		return -EIO;

	}
@@ -2396,10 +2396,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),
@@ -2456,6 +2452,7 @@ static void end_bio_extent_writepage(struct bio *bio) 
	u64 end;

	int i;



	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, i) {

		struct page *page = bvec->bv_page;

		struct inode *inode = page->mapping->host;
@@ -2526,6 +2523,7 @@ static void end_bio_extent_readpage(struct bio *bio) 
	int ret;

	int i;



	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, i) {

		struct page *page = bvec->bv_page;

		struct inode *inode = page->mapping->host;
@@ -3680,6 +3678,7 @@ static void end_bio_extent_buffer_writepage(struct bio *bio) 
	struct extent_buffer *eb;

	int i, done;



	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, i) {

		struct page *page = bvec->bv_page;

fs/btrfs/extent_io.h

+2 −2
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start, 
		u64 end);

int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,

				struct io_failure_record **failrec_ret);

int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio,

bool btrfs_check_repairable(struct inode *inode, struct bio *failed_bio,

			    struct io_failure_record *failrec, int fail_mirror);

struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,

				    struct io_failure_record *failrec,

fs/btrfs/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -8016,10 +8016,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,
@@ -8059,6 +8055,7 @@ static void btrfs_retry_endio_nocsum(struct bio *bio) 
	ASSERT(bio->bi_io_vec->bv_len == btrfs_inode_sectorsize(inode));



	done->uptodate = 1;

	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, i)

		clean_io_failure(BTRFS_I(inode)->root->fs_info, failure_tree,

				 io_tree, done->start, bvec->bv_page,
@@ -8150,6 +8147,7 @@ static void btrfs_retry_endio(struct bio *bio) 
	io_tree = &BTRFS_I(inode)->io_tree;

	failure_tree = &BTRFS_I(inode)->io_failure_tree;



	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, i) {

		ret = __readpage_endio_check(inode, io_bio, i, bvec->bv_page,

					     bvec->bv_offset, done->start,