openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: lift make_bad_inode into btrfs_iget 

We don't need to check is_bad_inode() after the call of
btrfs_read_locked_inode() - it's exactly the same as checking return
value for being non-zero.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: David Sterba <dsterba@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Al Viro 2018-07-29 23:04:50 +01:00 committed by David Sterba
parent 8d9e220ca0
commit 9bc2ceff66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/inode.c
View File

@ -3771,7 +3771,6 @@ static int btrfs_read_locked_inode(struct inode *inode)
make_bad:
btrfs_free_path(path);
make_bad_inode(inode);
return ret;
}
@ -5697,12 +5696,13 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
int ret;
ret = btrfs_read_locked_inode(inode);
if (!is_bad_inode(inode)) {
if (!ret) {
inode_tree_add(inode);
unlock_new_inode(inode);
if (new)
*new = 1;
} else {
make_bad_inode(inode);
unlock_new_inode(inode);
iput(inode);
ASSERT(ret < 0);