diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-04-28 16:07:26 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-05-26 01:14:06 +0200 |
| commit | c525f03601f52c83ded046624138f2a45e0ba56c (patch) | |
| tree | 5eed9b94da77943ed04d06151d4ff6a4fdc1f7c3 /drivers/block/rbd.c | |
| parent | 42b0696527c49a109e9558162b8d109ae257d402 (diff) | |
| download | talos-obmc-linux-c525f03601f52c83ded046624138f2a45e0ba56c.tar.gz talos-obmc-linux-c525f03601f52c83ded046624138f2a45e0ba56c.zip | |
rbd: rbd_dev_header_unwatch_sync() variant
Introduce __rbd_dev_header_unwatch_sync(), which doesn't flush notify
callbacks. This is for the new rados_watcherrcb_t, which would be
called from a notify callback.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'drivers/block/rbd.c')
| -rw-r--r-- | drivers/block/rbd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 82b03aa509e6..fce23dc908e3 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3246,10 +3246,7 @@ static int rbd_dev_header_watch_sync(struct rbd_device *rbd_dev) return 0; } -/* - * Tear down a watch request, synchronously. - */ -static void rbd_dev_header_unwatch_sync(struct rbd_device *rbd_dev) +static void __rbd_dev_header_unwatch_sync(struct rbd_device *rbd_dev) { struct rbd_obj_request *obj_request; @@ -3269,6 +3266,14 @@ static void rbd_dev_header_unwatch_sync(struct rbd_device *rbd_dev) ceph_osdc_cancel_event(rbd_dev->watch_event); rbd_dev->watch_event = NULL; +} + +/* + * Tear down a watch request, synchronously. + */ +static void rbd_dev_header_unwatch_sync(struct rbd_device *rbd_dev) +{ + __rbd_dev_header_unwatch_sync(rbd_dev); dout("%s flushing notifies\n", __func__); ceph_osdc_flush_notifies(&rbd_dev->rbd_client->client->osdc); |
