diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2022-07-14 13:48:10 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-07-25 17:45:42 +0200 |
| commit | fc8b235fdc090a000e164b49c3384802ea44c636 (patch) | |
| tree | 1caf46ea2a0cb4e79f81ef979d26116072e41cfb /fs/btrfs | |
| parent | 0d8869fb6b6f82d5647ddaa6652e159d0f81d008 (diff) | |
| download | linux-rpi-fc8b235fdc090a000e164b49c3384802ea44c636.tar.gz linux-rpi-fc8b235fdc090a000e164b49c3384802ea44c636.tar.bz2 linux-rpi-fc8b235fdc090a000e164b49c3384802ea44c636.zip | |
btrfs: simplify error handling in btrfs_lookup_dentry
In btrfs_lookup_dentry releasing the reference of the sub_root and the
running orphan cleanup should only happen if the dentry found actually
represents a subvolume. This can only be true in the 'else' branch as
otherwise either fixup_tree_root_location returned an ENOENT error, in
which case sub_root wouldn't have been changed or if we got a different
errno this means btrfs_get_fs_root couldn't have executed successfully
again meaning sub_root will equal to root. So simplify all the branches
by moving the code into the 'else'.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 16789bbacf75..f20740812e5b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5866,14 +5866,14 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry) if (ret != -ENOENT) inode = ERR_PTR(ret); else - inode = new_simple_dir(dir->i_sb, &location, sub_root); + inode = new_simple_dir(dir->i_sb, &location, root); } else { inode = btrfs_iget(dir->i_sb, location.objectid, sub_root); - } - if (root != sub_root) btrfs_put_root(sub_root); - if (!IS_ERR(inode) && root != sub_root) { + if (IS_ERR(inode)) + return inode; + down_read(&fs_info->cleanup_work_sem); if (!sb_rdonly(inode->i_sb)) ret = btrfs_orphan_cleanup(sub_root); |