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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/ceph/osd_client.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index c39e7ed4b203..39c55d61e159 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
@@ -273,8 +273,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, | |||
273 | /* watch/notify events */ | 273 | /* watch/notify events */ |
274 | extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, | 274 | extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, |
275 | void (*event_cb)(u64, u64, u8, void *), | 275 | void (*event_cb)(u64, u64, u8, void *), |
276 | int one_shot, void *data, | 276 | void *data, struct ceph_osd_event **pevent); |
277 | struct ceph_osd_event **pevent); | ||
278 | extern void ceph_osdc_cancel_event(struct ceph_osd_event *event); | 277 | extern void ceph_osdc_cancel_event(struct ceph_osd_event *event); |
279 | extern int ceph_osdc_wait_event(struct ceph_osd_event *event, | 278 | extern int ceph_osdc_wait_event(struct ceph_osd_event *event, |
280 | unsigned long timeout); | 279 | unsigned long timeout); |