xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root

Browse Source 
Now that all callers of btrfs_get_fs_root are subsequently calling
btrfs_grab_fs_root and handling dropping the ref when they are done
appropriately, go ahead and push btrfs_grab_fs_root up into
btrfs_get_fs_root.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik
2020-01-24 09:32:56 -05:00
committed by David Sterba
parent 81f096edf0
commit bc44d7c4b2
14 changed files with 27 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/send.c
View File

@@ -7201,11 +7201,6 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
ret = PTR_ERR(clone_root);
goto out;
}
if (!btrfs_grab_fs_root(clone_root)) {
srcu_read_unlock(&fs_info->subvol_srcu, index);
ret = -ENOENT;
goto out;
}
spin_lock(&clone_root->root_item_lock);
if (!btrfs_root_readonly(clone_root) ||
btrfs_root_dead(clone_root)) {
@@ -7247,12 +7242,6 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
ret = PTR_ERR(sctx->parent_root);
goto out;
}
if (!btrfs_grab_fs_root(sctx->parent_root)) {
srcu_read_unlock(&fs_info->subvol_srcu, index);
ret = -ENOENT;
sctx->parent_root = ERR_PTR(ret);
goto out;
}
spin_lock(&sctx->parent_root->root_item_lock);
sctx->parent_root->send_in_progress++;