[PATCH 38/53] cephfs: Don't d_drop() before d_splice_alias()
NeilBrown <[email protected]>
| Newsgroups | gmane.comp.file-systems.ext4,gmane.linux.file-systems,gmane.linux.nfs,gmane.linux.file-systems.union,gmane.linux.kernel.mm,gmane.linux.kernel.cifs,gmane.linux.kernel,gmane.comp.file-systems.ceph.devel,gmane.comp.file-systems.ecryptfs.general,gmane.linux.uml.devel,gmane.linux.kernel.efi |
|---|---|
| Message-ID | <[email protected]> |
From: NeilBrown <[email protected]> In two places ceph drops a dentry and then calls d_splice_alias(). The d_drop() is no longer needed before d_splice_alias() and will cause problems for proposed changes to locking. Signed-off-by: NeilBrown <[email protected]> --- fs/ceph/file.c | 2 -- fs/ceph/inode.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 66bbf6d517a9..c40d129bbd03 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -751,8 +751,6 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode, unlock_new_inode(inode); } if (d_in_lookup(dentry) || d_really_is_negative(dentry)) { - if (!d_unhashed(dentry)) - d_drop(dentry); dn = d_splice_alias(inode, dentry); WARN_ON_ONCE(dn && dn != dentry); } diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 8557b207d337..32bac5cac8c4 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1517,9 +1517,6 @@ static int splice_dentry(struct dentry **pdn, struct inode *in) } } - /* dn must be unhashed */ - if (!d_unhashed(dn)) - d_drop(dn); realdn = d_splice_alias(in, dn); if (IS_ERR(realdn)) { pr_err_client(cl, "error %ld %p inode %p ino %llx.%llx\n", -- 2.50.0.107.gf914562f5916.dirty