Skip to content

Commit

Permalink
ceph: fix msgpool reservation leak
Browse files Browse the repository at this point in the history
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
  • Loading branch information
Yehuda Sadeh authored and Sage Weil committed Dec 22, 2009
1 parent b3d1dbb commit 93c20d9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion fs/ceph/osd_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions fs/ceph/osd_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 93c20d9

Please sign in to comment.