diff options
| author |   Yan, Zheng <zyan@redhat.com> | 2018-09-27 21:16:05 +0800 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2018-10-22 10:28:20 +0200 |
| commit | efe328230dc01aa0b1269aad0b5fae73eea4677a (patch) | |
| tree | 2b3aba69fa8d3ebe9f14a2997dee680768b0e26a /fs/ceph | |
| parent | ceph: check snap first in ceph_set_acl() (diff) | |
| download | linux-dev-efe328230dc01aa0b1269aad0b5fae73eea4677a.tar.xz linux-dev-efe328230dc01aa0b1269aad0b5fae73eea4677a.zip | |
Revert "ceph: fix dentry leak in splice_dentry()"
This reverts commit 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3.
splice_dentry() is used by three places. For two places, req->r_dentry
is passed to splice_dentry(). In the case of error, req->r_dentry does
not get updated. So splice_dentry() should not drop reference.
Cc: stable@vger.kernel.org # 4.18+
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index ebc7bdaed2d0..4055ab4d5c52 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1132,8 +1132,12 @@ 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 */ + dn = realdn; + /* + * Caller should release 'dn' in the case of error. + * If 'req->r_dentry' is passed to this function, + * caller should leave 'req->r_dentry' untouched. + */ goto out; } else if (realdn) { dout("dn %p (%d) spliced with %p (%d) " |