diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2020-01-24 17:33:01 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-03-23 19:01:33 +0300 |
| commit | 0024652895e3479cd0d372f63b57d9581a0bdd38 (patch) | |
| tree | c008726705f1e5c9aefab8392418bb9fbec51bdd /fs/btrfs/send.c | |
| parent | bd647ce385ec110fe7796267b6555873e48e44eb (diff) | |
| download | linux-0024652895e3479cd0d372f63b57d9581a0bdd38.tar.xz | |
btrfs: rename btrfs_put_fs_root and btrfs_grab_fs_root
We are now using these for all roots, rename them to btrfs_put_root()
and btrfs_grab_root();
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
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.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 3e243ad4a95f..6b86841315be 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -7205,7 +7205,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) if (!btrfs_root_readonly(clone_root) || btrfs_root_dead(clone_root)) { spin_unlock(&clone_root->root_item_lock); - btrfs_put_fs_root(clone_root); + btrfs_put_root(clone_root); srcu_read_unlock(&fs_info->subvol_srcu, index); ret = -EPERM; goto out; @@ -7213,7 +7213,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) if (clone_root->dedupe_in_progress) { dedupe_in_progress_warn(clone_root); spin_unlock(&clone_root->root_item_lock); - btrfs_put_fs_root(clone_root); + btrfs_put_root(clone_root); srcu_read_unlock(&fs_info->subvol_srcu, index); ret = -EAGAIN; goto out; @@ -7270,7 +7270,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) * for possible clone sources. */ sctx->clone_roots[sctx->clone_roots_cnt++].root = - btrfs_grab_fs_root(sctx->send_root); + btrfs_grab_root(sctx->send_root); /* We do a bsearch later */ sort(sctx->clone_roots, sctx->clone_roots_cnt, @@ -7358,20 +7358,20 @@ out: for (i = 0; i < sctx->clone_roots_cnt; i++) { btrfs_root_dec_send_in_progress( sctx->clone_roots[i].root); - btrfs_put_fs_root(sctx->clone_roots[i].root); + btrfs_put_root(sctx->clone_roots[i].root); } } else { for (i = 0; sctx && i < clone_sources_to_rollback; i++) { btrfs_root_dec_send_in_progress( sctx->clone_roots[i].root); - btrfs_put_fs_root(sctx->clone_roots[i].root); + btrfs_put_root(sctx->clone_roots[i].root); } btrfs_root_dec_send_in_progress(send_root); } if (sctx && !IS_ERR_OR_NULL(sctx->parent_root)) { btrfs_root_dec_send_in_progress(sctx->parent_root); - btrfs_put_fs_root(sctx->parent_root); + btrfs_put_root(sctx->parent_root); } kvfree(clone_sources_tmp); |