Revert "Btrfs: fix scrub to repair raid6 corruption"

This reverts commit d91bb7c6988bd6450284c762b33f2e1ea3fe7c97.

This commit used an incorrect log message.

Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 2e995e565633b73ece85ff2f1bdea72ba58b6052..d1bda68a3386437d2db0cb2304ae4757f7950ff5 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -2172,21 +2172,11 @@ int raid56_parity_recover(struct btrfs_fs_info *fs_info, 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);
 

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 08afafb6ecf763eb37bc579eeec11d9801fd63e2..69bc37a87c5a703cf9700e9416f0f934748cf9c0 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5110,14 +5110,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);