diff options
| author | Qu Wenruo <wqu@suse.com> | 2023-06-14 14:49:35 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2023-06-14 18:30:30 +0200 |
| commit | b50f2d048ecf1512ff85128ea4153bceb0e60590 (patch) | |
| tree | a51ed8bd7c4196fc7297b00a90674cf0677940bd | |
| parent | 745806fb4554f334e6406fa82b328562aa48f08f (diff) | |
| download | perf-tools-next-b50f2d048ecf1512ff85128ea4153bceb0e60590.tar.gz | |
btrfs: scrub: fix a return value overwrite in scrub_stripe()
[RETURN VALUE OVERWRITE]
Inside scrub_stripe(), we would submit all the remaining stripes after
iterating all extents.
But since flush_scrub_stripes() can return error, we need to avoid
overwriting the existing @ret if there is any error.
However the existing check is doing the wrong check:
ret2 = flush_scrub_stripes();
if (!ret2)
ret = ret2;
This would overwrite the existing @ret to 0 as long as the final flush
detects no critical errors.
[FIX]
We should check @ret other than @ret2 in that case.
Fixes: 8eb3dd17eadd ("btrfs: dev-replace: error out if we have unrepaired metadata error during")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 50c241aba1a13c..bceaa8c2007e67 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -2266,7 +2266,7 @@ next: } out: ret2 = flush_scrub_stripes(sctx); - if (!ret2) + if (!ret) ret = ret2; if (sctx->raid56_data_stripes) { for (int i = 0; i < nr_data_stripes(map); i++) |