2023-01-15 21:09:41

by Tanmay Bhushan

Subject: [PATCH] btrfs: raid56: Fix stripes if vertical errors are found

We take two stripe numbers if vertical errors are found.
In case it is just a pstripe it does not matter but in
case of raid 6 it matters a both stripes need to be fixed.

Signed-off-by: Tanmay Bhushan <[email protected]>
---
fs/btrfs/raid56.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 6a2cf754912d..f35898a78b16 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1886,7 +1886,7 @@ static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,
sector->uptodate = 1;
}
if (failb >= 0) {
- ret = verify_one_sector(rbio, faila, sector_nr);
+ ret = verify_one_sector(rbio, failb, sector_nr);
if (ret < 0)
goto cleanup;

--
2.34.1

2023-01-15 23:51:09

by Qu Wenruo

Subject: Re: [PATCH] btrfs: raid56: Fix stripes if vertical errors are found

On 2023/1/16 04:32, Tanmay Bhushan wrote:
> We take two stripe numbers if vertical errors are found.
> In case it is just a pstripe it does not matter but in
> case of raid 6 it matters a both stripes need to be fixed.
>
> Signed-off-by: Tanmay Bhushan <[email protected]>

Oh, my bad, typical copy-and-paste error.

Should go in to the next rc.

Fixes: 7a3150723061 ("btrfs: raid56: do data csum verification during
RMW cycle")

Thanks,
Qu
> ---
> fs/btrfs/raid56.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
> index 6a2cf754912d..f35898a78b16 100644
> --- a/fs/btrfs/raid56.c
> +++ b/fs/btrfs/raid56.c
> @@ -1886,7 +1886,7 @@ static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,
> sector->uptodate = 1;
> }
> if (failb >= 0) {
> - ret = verify_one_sector(rbio, faila, sector_nr);
> + ret = verify_one_sector(rbio, failb, sector_nr);
> if (ret < 0)
> goto cleanup;
>

2023-01-25 19:17:42

by David Sterba

Subject: Re: [PATCH] btrfs: raid56: Fix stripes if vertical errors are found

On Sun, Jan 15, 2023 at 09:32:15PM +0100, Tanmay Bhushan wrote:
> We take two stripe numbers if vertical errors are found.
> In case it is just a pstripe it does not matter but in
> case of raid 6 it matters a both stripes need to be fixed.
>
> Signed-off-by: Tanmay Bhushan <[email protected]>

Added to misc-next, thanks.