]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] reiserfs: remove d_splice_alias NULL check from reiserfs_lookup
authorPekka Enberg <penberg@cs.helsinki.fi>
Sat, 14 Jan 2006 21:21:09 +0000 (13:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 02:27:12 +0000 (18:27 -0800)
Remove redundant NULL check in reiserfs_lookup() as d_splice_alias() can take
NULL inode as input.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/reiserfs/namei.c

index 3549067c42d941546f4fa12ad266612a9f9f4413..8f8d8d01107c880975c4d2d2de465be7a3041018 100644 (file)
@@ -375,11 +375,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,
                return ERR_PTR(-EIO);
        }
 
-       if (inode)
-               return d_splice_alias(inode, dentry);
-
-       d_add(dentry, inode);
-       return NULL;
+       return d_splice_alias(inode, dentry);
 }
 
 /*