diff options
| author | Sasha Levin <Alexander.Levin@microsoft.com> | 2018-06-15 05:39:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-26 03:08:06 +0300 |
| commit | 1fab25ce8db367f0d6a22baba96bbe49e68ba5c7 (patch) | |
| tree | 455b6727b5d02e1ff0a8e5007b6398d74d584129 /fs/btrfs/volumes.c | |
| parent | 60649dacb3da3a757a99c9a7e6dd42867e1eb825 (diff) | |
| download | linux-1fab25ce8db367f0d6a22baba96bbe49e68ba5c7.tar.xz | |
Revert "Btrfs: fix scrub to repair raid6 corruption"
This reverts commit 186a6519dc94964a4c5c68fca482f20f71551f26.
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>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 76017e1b3c0f..c2495cde26f6 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -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); |