diff options
author | Alex Elder <elder@inktank.com> | 2013-02-15 12:42:30 -0500 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2013-02-18 13:20:00 -0500 |
commit | 3c663bbdcdf9296e0fe3362acb9e81f49d7b72c6 (patch) | |
tree | 6fe7358d5dfce2d39cde3f0b35a78808ab1b674d /drivers/block | |
parent | 60e56f138180e72fa8487d4b9c1c916013494f46 (diff) |
libceph: kill ceph_osdc_create_event() "one_shot" parameter
There is only one caller of ceph_osdc_create_event(), and it
provides 0 as its "one_shot" argument. Get rid of that argument and
just use 0 in its place.
Replace the code in handle_watch_notify() that executes if one_shot
is nonzero in the event with a BUG_ON() call.
While modifying "osd_client.c", give handle_watch_notify() static
scope.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 982963ec2607..13ee789f2328 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -1744,7 +1744,7 @@ static int rbd_dev_header_watch_sync(struct rbd_device *rbd_dev, int start) | |||
1744 | rbd_assert(start ^ !!rbd_dev->watch_request); | 1744 | rbd_assert(start ^ !!rbd_dev->watch_request); |
1745 | 1745 | ||
1746 | if (start) { | 1746 | if (start) { |
1747 | ret = ceph_osdc_create_event(osdc, rbd_watch_cb, 0, rbd_dev, | 1747 | ret = ceph_osdc_create_event(osdc, rbd_watch_cb, rbd_dev, |
1748 | &rbd_dev->watch_event); | 1748 | &rbd_dev->watch_event); |
1749 | if (ret < 0) | 1749 | if (ret < 0) |
1750 | return ret; | 1750 | return ret; |