From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Durgin Subject: Re: [PATCH 1/4] rbd: unregister linger in watch sync routine Date: Wed, 30 Jan 2013 11:30:20 -0800 Message-ID: <510974CC.6@inktank.com> References: <51043EF2.4070305@inktank.com> <51043F49.2020904@inktank.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pa0-f45.google.com ([209.85.220.45]:39260 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755333Ab3A3Tae (ORCPT ); Wed, 30 Jan 2013 14:30:34 -0500 Received: by mail-pa0-f45.google.com with SMTP id bg2so1264184pad.32 for ; Wed, 30 Jan 2013 11:30:33 -0800 (PST) In-Reply-To: <51043F49.2020904@inktank.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Alex Elder Cc: "ceph-devel@vger.kernel.org" Reviewed-by: Josh Durgin On 01/26/2013 12:40 PM, Alex Elder wrote: > 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: Alex Elder > --- > drivers/block/rbd.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 47e5798..363a813 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -1730,6 +1730,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) > @@ -4040,12 +4044,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); >