From 3e4a73f2e75fc2d47d0cf8c87f57e98004badb08 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Sat, 14 Jan 2006 13:21:09 -0800
Subject: [PATCH] --- yaml --- r: 18515 b: refs/heads/master c:
 d9975d6ba0668aa21d9f0c565d7df56c805c8d5c h: refs/heads/master i:   18513:
 98c1e85d337d715272b7feb695b15884df7e0216   18511:
 058a401be3656dbefb6ac81e08a254ab56f066a0 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/namei.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ad1877f40549..1c6647edb950 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ff6b1c2575f13885c1d5291e4283682ad9a41cd
+refs/heads/master: d9975d6ba0668aa21d9f0c565d7df56c805c8d5c
diff --git a/trunk/fs/reiserfs/namei.c b/trunk/fs/reiserfs/namei.c
index 3549067c42d9..8f8d8d01107c 100644
--- a/trunk/fs/reiserfs/namei.c
+++ b/trunk/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);
 }
 
 /*