Home Home > GIT Browse
diff options
authorAnand Jain <anand.jain@oracle.com>2018-11-11 22:22:17 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-31 08:12:37 +0100
commit6362aa508f82ee73018d75a2953bfbea57d62de8 (patch)
parentc341208094546f2beae2c057144345b8205f749c (diff)
btrfs: dev-replace: go back to suspended state if target device is missing
commit 0d228ece59a35a9b9e8ff0d40653234a6d90f61e upstream. At the time of forced unmount we place the running replace to BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED state, so when the system comes back and expect the target device is missing. Then let the replace state continue to be in BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED state instead of BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED as there isn't any matching scrub running as part of replace. Fixes: e93c89c1aaaa ("Btrfs: add new sources for device replace code") CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 0de0aa121eb8..fb973cc0af66 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -787,6 +787,8 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info)
"cannot continue dev_replace, tgtdev is missing");
"you may cancel the operation after 'mount -o degraded'");
+ dev_replace->replace_state =
btrfs_dev_replace_unlock(dev_replace, 1);
return 0;