diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-25 10:55:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-25 10:55:24 -0800 |
| commit | a075f23dd4b036ebaf918b3af477aa1f249ddfa0 (patch) | |
| tree | 748548edcb0633df51743ec88da04ff55289bb85 /fs/btrfs/dev-replace.c | |
| parent | 93d1a05ea6b29737715769e2c9551cfe8a5fef22 (diff) | |
| parent | 4cea9037f82a6deed0f2f61e4054b7ae2519ef87 (diff) | |
| download | lwn-a075f23dd4b036ebaf918b3af477aa1f249ddfa0.tar.gz lwn-a075f23dd4b036ebaf918b3af477aa1f249ddfa0.zip | |
Merge tag 'for-5.5-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba:
"Here's a last minute fix for a regression introduced in this
development cycle.
There's a small chance of a silent corruption when device replace and
NOCOW data writes happen at the same time in one block group. Metadata
or COW data writes are unaffected.
The extra fixup patch is there to silence an unnecessary warning"
* tag 'for-5.5-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: dev-replace: remove warning for unknown return codes when finished
btrfs: scrub: Require mandatory block group RO for dev-replace
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index f639dde2a679..ba4d8f375b3c 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -500,11 +500,8 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, &dev_replace->scrub_progress, 0, 1); ret = btrfs_dev_replace_finishing(fs_info, ret); - if (ret == -EINPROGRESS) { + if (ret == -EINPROGRESS) ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS; - } else if (ret != -ECANCELED) { - WARN_ON(ret); - } return ret; |