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

Commit 0198e5b7 authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: raid56: iterate raid56 internal bio with bio_for_each_segment_all 



Bio iterated by set_bio_pages_uptodate() is raid56 internal one, so it
will never be a BIO_CLONED bio, and since this is called by end_io
functions, bio->bi_iter.bi_size is zero, we mustn't use
bio_for_each_segment() as that is a no-op if bi_size is zero.

Fixes: 6592e58c ("Btrfs: fix write corruption due to bio cloning on raid5/6")
Cc: <stable@vger.kernel.org> # v4.12-rc6+
Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent df6703e1

fs/btrfs/raid56.c

+5 −6
Original line number Diff line number Diff line
@@ -1441,14 +1441,13 @@ static int fail_bio_stripe(struct btrfs_raid_bio *rbio, 
 */

static void set_bio_pages_uptodate(struct bio *bio)

{

	struct bio_vec bvec;

	struct bvec_iter iter;

	struct bio_vec *bvec;

	int i;



	if (bio_flagged(bio, BIO_CLONED))

		bio->bi_iter = btrfs_io_bio(bio)->iter;

	ASSERT(!bio_flagged(bio, BIO_CLONED));



	bio_for_each_segment(bvec, bio, iter)

		SetPageUptodate(bvec.bv_page);

	bio_for_each_segment_all(bvec, bio, i)

		SetPageUptodate(bvec->bv_page);

}



/*