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) | |
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, | |||
| 372 | if (inode && get_node_id(inode) == FUSE_ROOT_ID) | 372 | if (inode && get_node_id(inode) == FUSE_ROOT_ID) |
| 373 | goto out_iput; | 373 | goto out_iput; |
| 374 | 374 | ||
| 375 | newent = d_materialise_unique(entry, inode); | 375 | newent = d_splice_alias(inode, entry); |
| 376 | err = PTR_ERR(newent); | 376 | err = PTR_ERR(newent); |
| 377 | if (IS_ERR(newent)) | 377 | if (IS_ERR(newent)) |
| 378 | goto out_err; | 378 | goto out_err; |
| @@ -1320,7 +1320,7 @@ static int fuse_direntplus_link(struct file *file, | |||
| 1320 | if (!inode) | 1320 | if (!inode) |
| 1321 | goto out; | 1321 | goto out; |
| 1322 | 1322 | ||
| 1323 | alias = d_materialise_unique(dentry, inode); | 1323 | alias = d_splice_alias(inode, dentry); |
| 1324 | err = PTR_ERR(alias); | 1324 | err = PTR_ERR(alias); |
| 1325 | if (IS_ERR(alias)) | 1325 | if (IS_ERR(alias)) |
| 1326 | goto out; | 1326 | goto out; |
