---

yaml --- r: 320264 b: refs/heads/master c: ab8cb34 h: refs/heads/master v: v3
git-mirror · Jun 6, 2012 · 4cb7700 · 4cb7700
1 parent 4aca7b0
commit 4cb7700
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -139,15 +139,15 @@ 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);
 		ceph_con_revoke_message(req->r_con_filling_msg,
 				      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);