diff --git a/[refs] b/[refs] index 998fe28893e1..67b367c3164a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc996099174dc05b35b7a29301026987990e7f8c +refs/heads/master: 2d8a10cd1760e7ecc07a21e409485947c68a3291 diff --git a/trunk/fs/efs/namei.c b/trunk/fs/efs/namei.c index 3a404e7fad53..291abb11e20e 100644 --- a/trunk/fs/efs/namei.c +++ b/trunk/fs/efs/namei.c @@ -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,