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

Commit 1fab25ce authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "Btrfs: fix scrub to repair raid6 corruption" 



This reverts commit 186a6519.

This commit used an incorrect log message.

Reported-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60649dac

fs/btrfs/raid56.c

+4 −14
Original line number Diff line number Diff line
@@ -2161,21 +2161,11 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio, 
	}



	/*

	 * Loop retry:

	 * for 'mirror == 2', reconstruct from all other stripes.

	 * for 'mirror_num > 2', select a stripe to fail on every retry.

	 * reconstruct from the q stripe if they are

	 * asking for mirror 3

	 */

	if (mirror_num > 2) {

		/*

		 * 'mirror == 3' is to fail the p stripe and

		 * reconstruct from the q stripe.  'mirror > 3' is to

		 * fail a data stripe and reconstruct from p+q stripe.

		 */

		rbio->failb = rbio->real_stripes - (mirror_num - 1);

		ASSERT(rbio->failb > 0);

		if (rbio->failb <= rbio->faila)

			rbio->failb--;

	}

	if (mirror_num == 3)

		rbio->failb = rbio->real_stripes - 2;



	ret = lock_stripe_add(rbio);

fs/btrfs/volumes.c

+1 −8
Original line number Diff line number Diff line
@@ -5186,14 +5186,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) 
	else if (map->type & BTRFS_BLOCK_GROUP_RAID5)

		ret = 2;

	else if (map->type & BTRFS_BLOCK_GROUP_RAID6)

		/*

		 * There could be two corrupted data stripes, we need

		 * to loop retry in order to rebuild the correct data.

		 *

		 * Fail a stripe at a time on every retry except the

		 * stripe under reconstruction.

		 */

		ret = map->num_stripes;

		ret = 3;

	else

		ret = 1;

	free_extent_map(em);