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

[deliverable/linux.git] / fs / nilfs2 / namei.c

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 546849b3e88f1935585067628e158f4233631d17..a3141990061e28ec19b8997b132f2d3eb4bcc63b 100644 (file)
--- 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);
 }