diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-12 22:24:21 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:20 -0500 |
commit | 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531 (patch) | |
tree | 1a3d658ecfe4375e0ca4f837f6c7f8397efdefba /fs/fuse | |
parent | b5ae6b15bd73e35b129408755a0804287a87e041 (diff) | |
download | linux-stable-41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531.tar.gz linux-stable-41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531.tar.bz2 linux-stable-41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531.zip |
switch d_materialise_unique() users to d_splice_alias()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index dbab798f5caf..df562cc87763 100644 --- 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; |