ceph: fix msgpool reservation leak

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>

2 files changed, 5 insertions, 1 deletions

diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index 67ef8ab06af4..63482ef3de01 100644
--- a/fs/ceph/osd_client.c
+++ b/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/fs/ceph/osd_client.h b/fs/ceph/osd_client.h
index 20ee61847416..2e4cfd1e9f10 100644
--- a/fs/ceph/osd_client.h
+++ b/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;