aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-08-18 15:36:47 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-23 05:13:12 -0400
commit8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd (patch)
tree2134d6ee7bfcb64e79eb026dff07c0fab7d0567e /fs/jffs2
parentc002a6c7977320f95b5edede5ce4e0eeecf291ff (diff)
downloadkernel_samsung_crespo-8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd.zip
kernel_samsung_crespo-8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd.tar.gz
kernel_samsung_crespo-8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd.tar.bz2
[JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
Now that JFFS2 can be exported by NFS, we need to get this right. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/dir.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index b1aaae8..621bdfa 100644
--- a/fs/jffs2/dir.c
+++ b/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);
}
/***********************************************************************/