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

Commit 61c74035 authored by Alex Elder's avatar Alex Elder
Browse files

rbd: remove linger unconditionally 



In __unregister_linger_request(), the request is being removed
from the osd client's req_linger list only when the request
has a non-null osd pointer.  It should be done whether or not
the request currently has an osd.

This is most likely a non-issue because I believe the request
will always have an osd when this function is called.

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

net/ceph/osd_client.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -906,8 +906,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc, 
					struct ceph_osd_request *req)

					struct ceph_osd_request *req)

{

{

	dout("__unregister_linger_request %p\n", req);

	dout("__unregister_linger_request %p\n", req);

	if (req->r_osd) {

	list_del_init(&req->r_linger_item);

	list_del_init(&req->r_linger_item);

	if (req->r_osd) {

		list_del_init(&req->r_linger_osd);

		list_del_init(&req->r_linger_osd);





		if (list_empty(&req->r_osd->o_requests) &&

		if (list_empty(&req->r_osd->o_requests) &&