deuglify squashfs_lookup()
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 9 Jul 2011 00:57:47 +0000 (20:57 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 20 Jul 2011 05:44:24 +0000 (01:44 -0400)
d_splice_alias(NULL, dentry) is equivalent to d_add(dentry, NULL), NULL
so no need for that if (inode) ... in there (or ERR_PTR(0), for that
matter)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/squashfs/namei.c

index 4bc63ac64bc01bdbbc01cc6a22e5494b06a876ae..51b36958492b0e335ab5a4fadd6cef7026643504 100644 (file)
@@ -232,10 +232,7 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
 
 exit_lookup:
        kfree(dire);
-       if (inode)
-               return d_splice_alias(inode, dentry);
-       d_add(dentry, inode);
-       return ERR_PTR(0);
+       return d_splice_alias(inode, dentry);
 
 data_error:
        err = -EIO;