redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

btrfs: move clearing of EXCL_OP out of __cancel_balance 

Make the clearning visible in the callers so we can pair it with the
test_and_set part.

Signed-off-by: David Sterba <dsterba@suse.com>
hifive-unleashed-5.1
David Sterba 2018-03-20 17:28:05 +01:00
parent 72b81abf95
commit a17c95df4c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ioctl.c
View File

@ -4462,7 +4462,7 @@ do_balance:
* Ownership of bctl and filesystem flag BTRFS_FS_EXCL_OP
* goes to to btrfs_balance. bctl is freed in __cancel_balance,
* or, if restriper was paused all the way until unmount, in
* free_fs_info. The flag is cleared in __cancel_balance.
* free_fs_info. The flag should be cleared after __cancel_balance.
*/
need_unlock = false;

13
fs/btrfs/volumes.c
View File

@ -3780,8 +3780,6 @@ static void __cancel_balance(struct btrfs_fs_info *fs_info)
ret = del_balance_item(fs_info);
if (ret)
btrfs_handle_fs_error(fs_info, ret, NULL);
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
}
/* Non-zero return value signifies invalidity */
@ -3939,6 +3937,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
if ((ret && ret != -ECANCELED && ret != -ENOSPC) ||
balance_need_close(fs_info)) {
__cancel_balance(fs_info);
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
}
wake_up(&fs_info->balance_wait_q);
@ -3947,10 +3946,10 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
out:
if (bctl->flags & BTRFS_BALANCE_RESUME)
__cancel_balance(fs_info);
else {
else
kfree(bctl);
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
}
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
return ret;
}
@ -4118,8 +4117,10 @@ int btrfs_cancel_balance(struct btrfs_fs_info *fs_info)
mutex_lock(&fs_info->volume_mutex);
mutex_lock(&fs_info->balance_mutex);
if (fs_info->balance_ctl)
if (fs_info->balance_ctl) {
__cancel_balance(fs_info);
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
}
mutex_unlock(&fs_info->volume_mutex);
}