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/ceph | |
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/ceph')
-rw-r--r-- | fs/ceph/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 7a1df90c7771..90ec8e32c138 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c | |||
@@ -967,7 +967,7 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in, | |||
967 | /* dn must be unhashed */ | 967 | /* dn must be unhashed */ |
968 | if (!d_unhashed(dn)) | 968 | if (!d_unhashed(dn)) |
969 | d_drop(dn); | 969 | d_drop(dn); |
970 | realdn = d_materialise_unique(dn, in); | 970 | realdn = d_splice_alias(in, dn); |
971 | if (IS_ERR(realdn)) { | 971 | if (IS_ERR(realdn)) { |
972 | pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", | 972 | pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", |
973 | PTR_ERR(realdn), dn, in, ceph_vinop(in)); | 973 | PTR_ERR(realdn), dn, in, ceph_vinop(in)); |