commit 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531
author Al Viro <viro@zeniv.linux.org.uk> Sun Oct 12 22:24:21 2014 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Nov 19 13:01:20 2014 -0500
tree 1a3d658ecfe4375e0ca4f837f6c7f8397efdefba
parent b5ae6b15bd73e35b129408755a0804287a87e041

switch d_materialise_unique() users to d_splice_alias()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/fuse/dir.c

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index dbab798..df562cc 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -372,7 +372,7 @@
 	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 @@
 	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;