From 77ae5b3779cba8ffc052986cc7534e0330bb0f9b Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 4 Jun 2012 14:43:32 -0500 Subject: [PATCH] --- yaml --- r: 311209 b: refs/heads/master c: 680584fab05efff732b5ae16ad601ba994d7b505 h: refs/heads/master i: 311207: 2fa6e49d6cc8dbd4a99b0491b84cf95c247db0ee v: v3 --- [refs] | 2 +- trunk/net/ceph/osd_client.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5217c3b18f4..736c8d455935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61600ef8483924039dcdec8b4717ca32bd3353c6 +refs/heads/master: 680584fab05efff732b5ae16ad601ba994d7b505 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 1ffebed5ce0f..13538da41dd6 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/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);