1 files changed, 3 insertions, 4 deletions

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index b1aaae823a52..6f60cc910f4c 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -39,7 +39,8 @@ const struct file_operations jffs2_dir_operations =
         .read =         generic_read_dir,
         .readdir =      jffs2_readdir,
         .unlocked_ioctl=jffs2_ioctl,
-        .fsync =        jffs2_fsync
+        .fsync =        jffs2_fsync,
+        .llseek =       generic_file_llseek,
 };
 
 
@@ -108,9 +109,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);
 }
 
 /***********************************************************************/