Revert "Btrfs: fix scrub to repair raid6 corruption"

This reverts commit 95b286daf7ba784191023ad110122703eb2ebabc.

This commit used an incorrect log message.

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

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index b9fa99577bf7a3a4c9b78b0428dc86c3285acdbd..1a33d3eb36de184e4cbcf72efb26687857c70051 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -2160,21 +2160,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);
 

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b4d63a9842fac69d3e0854bfbefbc52d80509efb..ed75d70b4bc271f2193dd849a48c1abf032dafb9 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5056,14 +5056,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);