diff options
| author | Ilya Dryomov | 2016-04-28 16:07:28 +0200 |
|---|---|---|
| committer | Ilya Dryomov | 2016-05-26 01:15:30 +0200 |
| commit | 7cca78c9dcd1afa243e46edc31896730df85d2b5 (patch) | |
| tree | 1d3b677c6196ace6c87fae54c00e415e28e9bb67 /drivers/block | |
| parent | libceph: take osdc->lock in osdmap_show() and dump flags in hex (diff) | |
| download | kernel-qcow2-linux-7cca78c9dcd1afa243e46edc31896730df85d2b5.tar.gz kernel-qcow2-linux-7cca78c9dcd1afa243e46edc31896730df85d2b5.tar.xz kernel-qcow2-linux-7cca78c9dcd1afa243e46edc31896730df85d2b5.zip | |
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 '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 8eae6f56194d..81666a56415e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4902,7 +4902,7 @@ again: return ret; if (rbdc->client->osdc.osdmap->epoch < newest_epoch) { - ceph_monc_request_next_osdmap(&rbdc->client->monc); + ceph_osdc_maybe_request_map(&rbdc->client->osdc); (void) ceph_monc_wait_osdmap(&rbdc->client->monc, newest_epoch, opts->mount_timeout); |