Merge branch 'topic/opal-ipmi' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe...

[firefly-linux-kernel-4.4.55.git] / fs / fuse / dir.c

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index dbab798f5cafefd8e0ad848298a7baa0f1b70ad4..df562cc87763692fac081068fa40114d69cd8164 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -372,7 +372,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
        if (inode && get_node_id(inode) == FUSE_ROOT_ID)
                goto out_iput;
 
-       newent = d_materialise_unique(entry, inode);
+       newent = d_splice_alias(inode, entry);
        err = PTR_ERR(newent);
        if (IS_ERR(newent))
                goto out_err;
@@ -1320,7 +1320,7 @@ static int fuse_direntplus_link(struct file *file,
        if (!inode)
                goto out;
 
-       alias = d_materialise_unique(dentry, inode);
+       alias = d_splice_alias(inode, dentry);
        err = PTR_ERR(alias);
        if (IS_ERR(alias))
                goto out;