aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2006-01-14 13:21:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 18:27:12 -0800
commitd9975d6ba0668aa21d9f0c565d7df56c805c8d5c (patch)
treec761868423e57d5d083f80830b9eb6d79b28bac3
parent2ff6b1c2575f13885c1d5291e4283682ad9a41cd (diff)
[PATCH] reiserfs: remove d_splice_alias NULL check from reiserfs_lookup
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>
-rw-r--r--fs/reiserfs/namei.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 3549067c42d..8f8d8d01107 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -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);
}
/*