diff options
| author | Alex Elder <elder@inktank.com> | 2012-06-04 14:43:32 -0500 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-06-20 07:43:48 -0500 |
| commit | 680584fab05efff732b5ae16ad601ba994d7b505 (patch) | |
| tree | 08f9fe218f4107c3afdaf1293f62bfeb97ca25b8 /net | |
| parent | 61600ef8483924039dcdec8b4717ca32bd3353c6 (diff) | |
| download | linux-stable-680584fab05efff732b5ae16ad601ba994d7b505.tar.gz linux-stable-680584fab05efff732b5ae16ad601ba994d7b505.tar.bz2 linux-stable-680584fab05efff732b5ae16ad601ba994d7b505.zip | |
libceph: osd_client: don't drop reply reference too early
In ceph_osdc_release_request(), a reference to the r_reply message
is dropped. But just after that, that same message is revoked if it
was in use to receive an incoming reply. Reorder these so we are
sure we hold a reference until we're actually done with the message.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit ab8cb34a4b2f60281a4b18b1f1ad23bc2313d91b)
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 1ffebed5ce0f..13538da41dd6 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -139,8 +139,6 @@ void ceph_osdc_release_request(struct kref *kref) if (req->r_request) ceph_msg_put(req->r_request); - if (req->r_reply) - ceph_msg_put(req->r_reply); if (req->r_con_filling_msg) { dout("release_request revoking pages %p from con %p\n", req->r_pages, req->r_con_filling_msg); @@ -148,6 +146,8 @@ void ceph_osdc_release_request(struct kref *kref) req->r_reply); ceph_con_put(req->r_con_filling_msg); } + if (req->r_reply) + ceph_msg_put(req->r_reply); if (req->r_own_pages) ceph_release_page_vector(req->r_pages, req->r_num_pages); |