---

yaml --- r: 188652 b: refs/heads/master c: 93c20d9 h: refs/heads/master v: v3
git-mirror · Dec 22, 2009 · 64d4bae · 64d4bae
1 parent 5bb31df
commit 64d4bae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3d1dbbdd5670d8a9fb01f7dfb1cac522ff6795a
+refs/heads/master: 93c20d98c29ccefa039c3843ccc37122caaf3d31
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
@@ -145,6 +145,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
 		ceph_osdc_put_request(req);
 		return ERR_PTR(-ENOMEM);
 	}
+	req->r_num_prealloc_reply = num_reply;
 
 	req->r_osdc = osdc;
 	req->r_mempool = use_mempool;
@@ -165,7 +166,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
 	else
 		msg = ceph_msg_new(CEPH_MSG_OSD_OP, msg_size, 0, 0, NULL);
 	if (IS_ERR(msg)) {
-		ceph_msgpool_resv(&osdc->msgpool_op_reply, num_reply);
+		ceph_msgpool_resv(&osdc->msgpool_op_reply, -num_reply);
 		ceph_osdc_put_request(req);
 		return ERR_PTR(PTR_ERR(msg));
 	}
@@ -465,6 +466,8 @@ static void __unregister_request(struct ceph_osd_client *osdc,
 	rb_erase(&req->r_node, &osdc->requests);
 	osdc->num_requests--;
 
+	ceph_msgpool_resv(&osdc->msgpool_op_reply, -req->r_num_prealloc_reply);
+
 	if (req->r_osd) {
 		/* make sure the original request isn't in flight. */
 		ceph_con_revoke(&req->r_osd->o_con, req->r_request);

diff --git a/trunk/fs/ceph/osd_client.h b/trunk/fs/ceph/osd_client.h
@@ -48,6 +48,7 @@ struct ceph_osd_request {
 	int               r_flags;     /* any additional flags for the osd */
 	u32               r_sent;      /* >0 if r_request is sending/sent */
 	int r_prepared_pages, r_got_reply;
+	int		  r_num_prealloc_reply;
 
 	struct ceph_osd_client *r_osdc;
 	struct kref       r_kref;