Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / fs / kernfs / dir.c

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 1c77193..37989f0 100644 (file)
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -807,7 +807,7 @@ static struct dentry *kernfs_iop_lookup(struct inode *dir,
        }
 
        /* instantiate and hash dentry */
-       ret = d_materialise_unique(dentry, inode);
+       ret = d_splice_alias(inode, dentry);
  out_unlock:
        mutex_unlock(&kernfs_mutex);
        return ret;