Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93c20d98 authored by Yehuda Sadeh's avatar Yehuda Sadeh Committed by Sage Weil
Browse files

ceph: fix msgpool reservation leak 



Signed-off-by: default avatarYehuda Sadeh <yehuda@hq.newdream.net>
parent b3d1dbbd

fs/ceph/osd_client.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

fs/ceph/osd_client.h

+1 −0
Original line number Diff line number Diff line
@@ -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;