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

Commit 6977c3f9 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: unregister linger in watch sync routine 



Move the code that unregisters an rbd device's lingering header
object watch request into rbd_dev_header_watch_sync(), so it
occurs in the same function that originally sets up that request.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 9f20e02a

drivers/block/rbd.c

+4 −6
Original line number Diff line number Diff line
@@ -1721,6 +1721,10 @@ static int rbd_dev_header_watch_sync(struct rbd_device *rbd_dev, int start) 
	if (start) {

		rbd_dev->watch_request = obj_request->osd_req;

		ceph_osdc_set_request_linger(osdc, rbd_dev->watch_request);

	} else {

		ceph_osdc_unregister_linger_request(osdc,

						rbd_dev->watch_request);

		rbd_dev->watch_request = NULL;

	}

	ret = rbd_obj_request_submit(osdc, obj_request);

	if (ret)
@@ -3995,12 +3999,6 @@ static void rbd_dev_release(struct device *dev) 
{

	struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);



	if (rbd_dev->watch_request) {

		struct ceph_client *client = rbd_dev->rbd_client->client;



		ceph_osdc_unregister_linger_request(&client->osdc,

						    rbd_dev->watch_request);

	}

	if (rbd_dev->watch_event)

		rbd_dev_header_watch_sync(rbd_dev, 0);