diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-05-05 08:41:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 08:41:36 +0200 |
| commit | f3391a160b22f8e006f3fb8ef39aa01da749fbf0 (patch) | |
| tree | 9a8f61fe1a3dd0d12e7511567b2344f80f5aa531 /fs/btrfs/dev-replace.c | |
| parent | x86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has_hypervisor (diff) | |
| parent | Linux 4.6-rc6 (diff) | |
| download | wireguard-linux-f3391a160b22f8e006f3fb8ef39aa01da749fbf0.tar.xz wireguard-linux-f3391a160b22f8e006f3fb8ef39aa01da749fbf0.zip | |
Merge tag 'v4.6-rc6' into x86/cpu, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index a1d6652e0c47..26bcb487f958 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -394,6 +394,8 @@ int btrfs_dev_replace_start(struct btrfs_root *root, dev_replace->cursor_right = 0; dev_replace->is_valid = 1; dev_replace->item_needs_writeback = 1; + atomic64_set(&dev_replace->num_write_errors, 0); + atomic64_set(&dev_replace->num_uncorrectable_read_errors, 0); args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR; btrfs_dev_replace_unlock(dev_replace, 1); |