diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-29 15:19:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-29 15:19:47 -0400 |
| commit | 788695385933ff2dedaef0c3e5cb07659cc44018 (patch) | |
| tree | ec5301c6be56eae217be8305b76ee86d54e78760 | |
| parent | cd993fc4316d5268f42ab991e9a2c8a6e6cd8dc1 (diff) | |
| parent | 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3 (diff) | |
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.c | 1 |
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) | |||
| 1135 | if (IS_ERR(realdn)) { | 1135 | if (IS_ERR(realdn)) { |
| 1136 | pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", | 1136 | pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", |
| 1137 | PTR_ERR(realdn), dn, in, ceph_vinop(in)); | 1137 | PTR_ERR(realdn), dn, in, ceph_vinop(in)); |
| 1138 | dput(dn); | ||
| 1138 | dn = realdn; /* note realdn contains the error */ | 1139 | dn = realdn; /* note realdn contains the error */ |
| 1139 | goto out; | 1140 | goto out; |
| 1140 | } else if (realdn) { | 1141 | } else if (realdn) { |