]> err.no Git - linux-2.6/commitdiff
[PATCH] isofs: remove d_splice_alias NULL check from isofs_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 isofs_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/isofs/namei.c

index e37e82b7cbf0127281fb12deca7475810906674a..e7ba0c30e0711ff16669c1ec6e0e8cee20be7f74 100644 (file)
@@ -185,8 +185,5 @@ struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct n
                }
        }
        unlock_kernel();
-       if (inode)
-               return d_splice_alias(inode, dentry);
-       d_add(dentry, inode);
-       return NULL;
+       return d_splice_alias(inode, dentry);
 }