make d_splice_alias(ERR_PTR(err), dentry) = ERR_PTR(err)

... and simplify the living hell out of callers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 1 insertions, 6 deletions

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 546849b3e88f..a3141990061e 100644
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -72,12 +72,7 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
                 return ERR_PTR(-ENAMETOOLONG);
 
         ino = nilfs_inode_by_name(dir, &dentry->d_name);
-        inode = NULL;
-        if (ino) {
-                inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino);
-                if (IS_ERR(inode))
-                        return ERR_CAST(inode);
-        }
+        inode = ino ? nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino) : NULL;
         return d_splice_alias(inode, dentry);
 }