summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2020-01-24 15:32:56 +0100
committerDavid Sterba <dsterba@suse.com>2020-03-23 17:01:32 +0100
commitbc44d7c4b2b179c4b74fba208b9908e2ecbc1b4d (patch)
tree183d1adc1dcae85af965e25476a5a6c8cbb0137b /fs/btrfs/volumes.c
parentbtrfs: use btrfs_put_fs_root to free roots always (diff)
downloadlinux-bc44d7c4b2b179c4b74fba208b9908e2ecbc1b4d.tar.xz
linux-bc44d7c4b2b179c4b74fba208b9908e2ecbc1b4d.zip
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/volumes.c')
-rw-r--r--fs/btrfs/volumes.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3fca9f9e3b5d..089af576ad78 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4431,10 +4431,6 @@ static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info,
ret = 1;
goto out;
}
- if (!btrfs_grab_fs_root(subvol_root)) {
- ret = 1;
- goto out;
- }
switch (type) {
case BTRFS_UUID_KEY_SUBVOL: