diff options
| author |   Nikolay Borisov <nborisov@suse.com> | 2021-11-25 11:14:42 +0200 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-01-07 14:18:23 +0100 |
| commit | 621a1ee1d399c77dd4604aeab3e0f6319f649dbc (patch) | |
| tree | 17dd94fe739da8b2244df168c4097805ef5e07c1 /fs | |
| parent | btrfs: introduce exclusive operation BALANCE_PAUSED state (diff) | |
| download | linux-dev-621a1ee1d399c77dd4604aeab3e0f6319f649dbc.tar.xz linux-dev-621a1ee1d399c77dd4604aeab3e0f6319f649dbc.zip | |
btrfs: make device add compatible with paused balance in btrfs_exclop_start_try_lock
This is needed to enable device add to work in cases when a file system
has been mounted with 'skip_balance' mount option.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 6752e4b8b351..f706287942c5 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -387,6 +387,7 @@ bool btrfs_exclop_start(struct btrfs_fs_info *fs_info, * * Compatibility: * - the same type is already running + * - when trying to add a device and balance has been paused * - not BTRFS_EXCLOP_NONE - this is intentionally incompatible and the caller * must check the condition first that would allow none -> @type */ @@ -394,7 +395,9 @@ bool btrfs_exclop_start_try_lock(struct btrfs_fs_info *fs_info, enum btrfs_exclusive_operation type) { spin_lock(&fs_info->super_lock); - if (fs_info->exclusive_operation == type) + if (fs_info->exclusive_operation == type || + (fs_info->exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED && + type == BTRFS_EXCLOP_DEV_ADD)) return true; spin_unlock(&fs_info->super_lock); |