diff options
| author | Lu Fengqi | 2018-08-04 15:10:53 +0200 |
|---|---|---|
| committer | David Sterba | 2018-10-15 17:23:25 +0200 |
| commit | a7176f74fa570c83a48e66435b77651ad8fc5aee (patch) | |
| tree | 100d0f82bee3330445b55726e9a67515a24f7db4 /fs/btrfs/inode.c | |
| parent | Linux 4.19-rc8 (diff) | |
| download | kernel-qcow2-linux-a7176f74fa570c83a48e66435b77651ad8fc5aee.tar.gz kernel-qcow2-linux-a7176f74fa570c83a48e66435b77651ad8fc5aee.tar.xz kernel-qcow2-linux-a7176f74fa570c83a48e66435b77651ad8fc5aee.zip | |
btrfs: simplify the send_in_progress check in btrfs_delete_subvolume
Only when send_in_progress, we have to do something different such as
btrfs_warn() and return -EPERM. Therefore, we could check
send_in_progress first and process error handling, after the
root_item_lock has been got.
Just for better readability. No functional change.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3ea5339603cf..8b3d719e229d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4270,18 +4270,17 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) * again is not run concurrently. */ spin_lock(&dest->root_item_lock); - root_flags = btrfs_root_flags(&dest->root_item); - if (dest->send_in_progress == 0) { - btrfs_set_root_flags(&dest->root_item, - root_flags | BTRFS_ROOT_SUBVOL_DEAD); - spin_unlock(&dest->root_item_lock); - } else { + if (dest->send_in_progress) { spin_unlock(&dest->root_item_lock); btrfs_warn(fs_info, "attempt to delete subvolume %llu during send", dest->root_key.objectid); return -EPERM; } + root_flags = btrfs_root_flags(&dest->root_item); + btrfs_set_root_flags(&dest->root_item, + root_flags | BTRFS_ROOT_SUBVOL_DEAD); + spin_unlock(&dest->root_item_lock); down_write(&fs_info->subvol_sem); |