Commit 3837d208 authored by Al Viro's avatar Al Viro

simplify btrfs_lookup()

d_splice_alias() is fine with ERR_PTR(-E...) for inode
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8300807f
...@@ -5807,16 +5807,10 @@ static int btrfs_dentry_delete(const struct dentry *dentry) ...@@ -5807,16 +5807,10 @@ static int btrfs_dentry_delete(const struct dentry *dentry)
static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry, static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry,
unsigned int flags) unsigned int flags)
{ {
struct inode *inode; struct inode *inode = btrfs_lookup_dentry(dir, dentry);
inode = btrfs_lookup_dentry(dir, dentry); if (inode == ERR_PTR(-ENOENT))
if (IS_ERR(inode)) {
if (PTR_ERR(inode) == -ENOENT)
inode = NULL; inode = NULL;
else
return ERR_CAST(inode);
}
return d_splice_alias(inode, dentry); return d_splice_alias(inode, dentry);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment