V4L/DVB (8716): gspca: Bad start of sn9c110 and sensor ov7630.

[linux-2.6-omap-h63xx.git] / fs / efs / namei.c

diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index e26704742d410df10af191bd2964ba70161d1b64..291abb11e20ef8668fe9799b32b1342d04ece6cc 100644 (file)
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -8,9 +8,9 @@
 
 #include <linux/buffer_head.h>
 #include <linux/string.h>
-#include <linux/efs_fs.h>
 #include <linux/smp_lock.h>
 #include <linux/exportfs.h>
+#include "efs.h"
 
 
 static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len) {
@@ -74,8 +74,7 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei
        }
        unlock_kernel();
 
-       d_add(dentry, inode);
-       return NULL;
+       return d_splice_alias(inode, dentry);
 }
 
 static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino,