git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs: dev-replace: go back to suspend state if another EXCL_OP is running
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
dev-replace.c
diff --git
a/fs/btrfs/dev-replace.c
b/fs/btrfs/dev-replace.c
index 11df8f778b637478701dbc02c31ed70f6f11505a..33d07c426c59ee949bf2aecbb13a4c44a080a928 100644
(file)
--- a/
fs/btrfs/dev-replace.c
+++ b/
fs/btrfs/dev-replace.c
@@
-903,6
+903,10
@@
int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info)
* dev-replace to start anyway.
*/
if (test_and_set_bit(BTRFS_FS_EXCL_OP, &fs_info->flags)) {
* dev-replace to start anyway.
*/
if (test_and_set_bit(BTRFS_FS_EXCL_OP, &fs_info->flags)) {
+ btrfs_dev_replace_write_lock(dev_replace);
+ dev_replace->replace_state =
+ BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED;
+ btrfs_dev_replace_write_unlock(dev_replace);
btrfs_info(fs_info,
"cannot resume dev-replace, other exclusive operation running");
return 0;
btrfs_info(fs_info,
"cannot resume dev-replace, other exclusive operation running");
return 0;