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

Commit ab8cb34a authored by Alex Elder's avatar Alex Elder Committed by Alex Elder
Browse files

libceph: osd_client: don't drop reply reference too early 



In ceph_osdc_release_request(), a reference to the r_reply message
is dropped.  But just after that, that same message is revoked if it
was in use to receive an incoming reply.  Reorder these so we are
sure we hold a reference until we're actually done with the message.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 895cfcc8

net/ceph/osd_client.c

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ 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);
@@ -148,6 +146,8 @@ void ceph_osdc_release_request(struct kref *kref) 
				      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);