leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: hold a ref on the root in get_subvol_name_from_objectid

Browse Source 
We lookup the name of a subvol which means we'll cross into different
roots.  Hold a ref while we're doing the look ups in the fs_root we're
searching.

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-02-06 10:24:26 -05:00 committed by David Sterba
parent 6f9a3da5da
commit 5168489a07
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/super.c
View File

@ -1028,7 +1028,7 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
u64 subvol_objectid) u64 subvol_objectid)
{ {
struct btrfs_root *root = fs_info->tree_root; struct btrfs_root *root = fs_info->tree_root;
struct btrfs_root *fs_root; struct btrfs_root *fs_root = NULL;
struct btrfs_root_ref *root_ref; struct btrfs_root_ref *root_ref;
struct btrfs_inode_ref *inode_ref; struct btrfs_inode_ref *inode_ref;
struct btrfs_key key; struct btrfs_key key;
@ -1099,6 +1099,12 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
fs_root = btrfs_get_fs_root(fs_info, &key, true); fs_root = btrfs_get_fs_root(fs_info, &key, true);
if (IS_ERR(fs_root)) { if (IS_ERR(fs_root)) {
ret = PTR_ERR(fs_root); ret = PTR_ERR(fs_root);
fs_root = NULL;
goto err;
}
if (!btrfs_grab_fs_root(fs_root)) {
ret = -ENOENT;
fs_root = NULL;
goto err; goto err;
} }
@ -1143,6 +1149,8 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
ptr[0] = '/'; ptr[0] = '/';
btrfs_release_path(path); btrfs_release_path(path);
} }
btrfs_put_fs_root(fs_root);
fs_root = NULL;
} }
btrfs_free_path(path); btrfs_free_path(path);
@ -1155,6 +1163,7 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
return name; return name;
err: err:
btrfs_put_fs_root(fs_root);
btrfs_free_path(path); btrfs_free_path(path);
kfree(name); kfree(name);
return ERR_PTR(ret); return ERR_PTR(ret);