From 4cb77002a062fb37e6496d851cde46b86cff4fd6 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 4 Jun 2012 14:43:32 -0500 Subject: [PATCH] --- yaml --- r: 320264 b: refs/heads/master c: ab8cb34a4b2f60281a4b18b1f1ad23bc2313d91b h: refs/heads/master 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 f0db0cb4558b..027b9a46f238 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 895cfcc810e53d7d36639969c71efb9087221167 +refs/heads/master: ab8cb34a4b2f60281a4b18b1f1ad23bc2313d91b diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index e30efbcc6388..d8b6d319499a 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);