hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: simplify btrfs_iget 

Don't open-code iget_failed(), don't bother with btrfs_free_path(NULL),
move handling of positive return values of btrfs_lookup_inode() from
btrfs_read_locked_inode() to btrfs_iget() and kill now obviously
pointless ASSERT() in there.

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

29
fs/btrfs/inode.c
View File

@ -3604,18 +3604,15 @@ static int btrfs_read_locked_inode(struct inode *inode)
filled = true; filled = true;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) { if (!path)
ret = -ENOMEM; return -ENOMEM;
goto make_bad;
}
memcpy(&location, &BTRFS_I(inode)->location, sizeof(location)); memcpy(&location, &BTRFS_I(inode)->location, sizeof(location));
ret = btrfs_lookup_inode(NULL, root, path, &location, 0); ret = btrfs_lookup_inode(NULL, root, path, &location, 0);
if (ret) { if (ret) {
if (ret > 0) btrfs_free_path(path);
ret = -ENOENT; return ret;
goto make_bad;
} }
leaf = path->nodes[0]; leaf = path->nodes[0];
@ -3768,10 +3765,6 @@ cache_acl:
btrfs_sync_inode_flags_to_i_flags(inode); btrfs_sync_inode_flags_to_i_flags(inode);
return 0; return 0;
make_bad:
btrfs_free_path(path);
return ret;
} }
/* /*
@ -5702,11 +5695,15 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
if (new) if (new)
*new = 1; *new = 1;
} else { } else {
make_bad_inode(inode); iget_failed(inode);
unlock_new_inode(inode); /*
iput(inode); * ret > 0 can come from btrfs_search_slot called by
ASSERT(ret < 0); * btrfs_read_locked_inode, this means the inode item
inode = ERR_PTR(ret < 0 ? ret : -ESTALE); * was not found.
*/
if (ret > 0)
ret = -ENOENT;
inode = ERR_PTR(ret);
} }
} }