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

btrfs: handle NULL roots in btrfs_put/btrfs_grab_fs_root

Browse Source 
We want to use this for dropping all roots, and in some error cases we
may not have a root, so handle this to make the cleanup code easier.
Make btrfs_grab_fs_root the same so we can use it in cases where the
root may not exist (like the quota 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>
This commit is contained in:
Josef Bacik 2020-01-24 09:32:26 -05:00 committed by David Sterba
parent a98db0f304
commit 4cdfd93002
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/disk-io.h
View File

@ -88,6 +88,8 @@ struct btrfs_root *btrfs_alloc_dummy_root(struct btrfs_fs_info *fs_info);
*/ */
static inline struct btrfs_root *btrfs_grab_fs_root(struct btrfs_root *root) static inline struct btrfs_root *btrfs_grab_fs_root(struct btrfs_root *root)
{ {
if (!root)
return NULL;
if (refcount_inc_not_zero(&root->refs)) if (refcount_inc_not_zero(&root->refs))
return root; return root;
return NULL; return NULL;
@ -95,6 +97,8 @@ static inline struct btrfs_root *btrfs_grab_fs_root(struct btrfs_root *root)
static inline void btrfs_put_fs_root(struct btrfs_root *root) static inline void btrfs_put_fs_root(struct btrfs_root *root)
{ {
if (!root)
return;
if (refcount_dec_and_test(&root->refs)) if (refcount_dec_and_test(&root->refs))
kfree(root); kfree(root);
} }