aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-29 12:19:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-29 12:19:47 -0700
commit788695385933ff2dedaef0c3e5cb07659cc44018 (patch)
treeec5301c6be56eae217be8305b76ee86d54e78760
parentcd993fc4316d5268f42ab991e9a2c8a6e6cd8dc1 (diff)
parent8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3 (diff)
downloadlinux-stericsson-788695385933ff2dedaef0c3e5cb07659cc44018.tar.gz
Merge tag 'ceph-for-4.18-rc3' of git://github.com/ceph/ceph-client
Pull ceph fix from Ilya Dryomov: "A trivial dentry leak fix from Zheng" * tag 'ceph-for-4.18-rc3' of git://github.com/ceph/ceph-client: ceph: fix dentry leak in splice_dentry()
-rw-r--r--fs/ceph/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index ee764ac352ab..a866be999216 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1135,6 +1135,7 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in)
if (IS_ERR(realdn)) {
pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n",
PTR_ERR(realdn), dn, in, ceph_vinop(in));
+ dput(dn);
dn = realdn; /* note realdn contains the error */
goto out;
} else if (realdn) {