Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / fs / jffs2 / dir.c

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index b1aaae823a5227de63ebb0175e904f435ab27772..6f60cc910f4c568f527354357f60d63349a1d8c5 100644 (file)
--- 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);
 }
 
 /***********************************************************************/