diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-04-28 10:07:28 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-05-25 19:15:30 -0400 |
| commit | 7cca78c9dcd1afa243e46edc31896730df85d2b5 (patch) | |
| tree | 1d3b677c6196ace6c87fae54c00e415e28e9bb67 /include/linux/ceph | |
| parent | b4f34795697de9d1ee84a10c8439b4b9970ebd96 (diff) | |
libceph: replace ceph_monc_request_next_osdmap()
... with a wrapper around maybe_request_map() - no need for two
osdmap-specific functions.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/mon_client.h | 1 | ||||
| -rw-r--r-- | include/linux/ceph/osd_client.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h index 19800d9b45f3..1d730993c3f8 100644 --- a/include/linux/ceph/mon_client.h +++ b/include/linux/ceph/mon_client.h | |||
| @@ -128,7 +128,6 @@ bool ceph_monc_want_map(struct ceph_mon_client *monc, int sub, u32 epoch, | |||
| 128 | void ceph_monc_got_map(struct ceph_mon_client *monc, int sub, u32 epoch); | 128 | void ceph_monc_got_map(struct ceph_mon_client *monc, int sub, u32 epoch); |
| 129 | void ceph_monc_renew_subs(struct ceph_mon_client *monc); | 129 | void ceph_monc_renew_subs(struct ceph_mon_client *monc); |
| 130 | 130 | ||
| 131 | extern void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc); | ||
| 132 | extern int ceph_monc_wait_osdmap(struct ceph_mon_client *monc, u32 epoch, | 131 | extern int ceph_monc_wait_osdmap(struct ceph_mon_client *monc, u32 epoch, |
| 133 | unsigned long timeout); | 132 | unsigned long timeout); |
| 134 | 133 | ||
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 3e7bf72e4078..19b14862d3e0 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
| @@ -381,6 +381,7 @@ extern int ceph_osdc_wait_request(struct ceph_osd_client *osdc, | |||
| 381 | extern void ceph_osdc_sync(struct ceph_osd_client *osdc); | 381 | extern void ceph_osdc_sync(struct ceph_osd_client *osdc); |
| 382 | 382 | ||
| 383 | extern void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc); | 383 | extern void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc); |
| 384 | void ceph_osdc_maybe_request_map(struct ceph_osd_client *osdc); | ||
| 384 | 385 | ||
| 385 | extern int ceph_osdc_readpages(struct ceph_osd_client *osdc, | 386 | extern int ceph_osdc_readpages(struct ceph_osd_client *osdc, |
| 386 | struct ceph_vino vino, | 387 | struct ceph_vino vino, |
