From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr690132.outbound.protection.outlook.com ([40.107.69.132]:2453 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965015AbeFOCjY (ORCPT ); Thu, 14 Jun 2018 22:39:24 -0400 From: Sasha Levin To: "gregkh@linuxfoundation.org" CC: "ben.hutchings@codethink.co.uk" , "stable@vger.kernel.org" , Sasha Levin Subject: [PATCH 4.4 1/2] Revert "Btrfs: fix scrub to repair raid6 corruption" Date: Fri, 15 Jun 2018 02:39:22 +0000 Message-ID: <20180615023918.99280-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: This reverts commit 95b286daf7ba784191023ad110122703eb2ebabc. This commit used an incorrect log message. Signed-off-by: Sasha Levin --- fs/btrfs/raid56.c | 18 ++++-------------- fs/btrfs/volumes.c | 9 +-------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index b9fa99577bf7..1a33d3eb36de 100644 --- 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, } =20 /* - * Loop retry: - * for 'mirror =3D=3D 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 =3D=3D 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 =3D rbio->real_stripes - (mirror_num - 1); - ASSERT(rbio->failb > 0); - if (rbio->failb <=3D rbio->faila) - rbio->failb--; - } + if (mirror_num =3D=3D 3) + rbio->failb =3D rbio->real_stripes - 2; =20 ret =3D lock_stripe_add(rbio); =20 diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b4d63a9842fa..ed75d70b4bc2 100644 --- 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 =3D 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 =3D map->num_stripes; + ret =3D 3; else ret =3D 1; free_extent_map(em); --=20 2.17.1