From de9f93a4d86157b307466a8fca2a05eabfa8e20f Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 18 Aug 2008 15:36:47 +0100
Subject: [PATCH] --- yaml --- r: 117472 b: refs/heads/master c:
 8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/jffs2/dir.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c7c454b2afe6..852a28f47767 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c002a6c7977320f95b5edede5ce4e0eeecf291ff
+refs/heads/master: 8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd
diff --git a/trunk/fs/jffs2/dir.c b/trunk/fs/jffs2/dir.c
index b1aaae823a52..621bdfa994e7 100644
--- a/trunk/fs/jffs2/dir.c
+++ b/trunk/fs/jffs2/dir.c
@@ -108,9 +108,7 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
 		}
 	}
 
-	d_add(target, inode);
-
-	return NULL;
+	return d_splice_alias(inode, target);
 }
 
 /***********************************************************************/