summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/send.c
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2020-01-24 09:32:56 -0500
committerDavid Sterba <dsterba@suse.com>2020-03-23 17:01:32 +0100
commitbc44d7c4b2b179c4b74fba208b9908e2ecbc1b4d (patch)
tree183d1adc1dcae85af965e25476a5a6c8cbb0137b /fs/btrfs/send.c
parent81f096edf0472864879e1e5a7f0fdf87ea90fe75 (diff)
downloadlinux-bc44d7c4b2b179c4b74fba208b9908e2ecbc1b4d.tar.bz2
btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root
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>
Diffstat (limited to 'fs/btrfs/send.c')
-rw-r--r--fs/btrfs/send.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 31495cdf1877..3e243ad4a95f 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -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++;