summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2016-04-28 16:07:28 +0200
committerIlya Dryomov <idryomov@gmail.com>2016-05-26 01:15:30 +0200
commit7cca78c9dcd1afa243e46edc31896730df85d2b5 (patch)
tree1d3b677c6196ace6c87fae54c00e415e28e9bb67 /net
parentb4f34795697de9d1ee84a10c8439b4b9970ebd96 (diff)
downloadlinux-stable-7cca78c9dcd1afa243e46edc31896730df85d2b5.tar.gz
linux-stable-7cca78c9dcd1afa243e46edc31896730df85d2b5.tar.bz2
linux-stable-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 'net')
-rw-r--r--net/ceph/mon_client.c14
-rw-r--r--net/ceph/osd_client.c7
2 files changed, 7 insertions, 14 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 4e49b2296920..72a910bf7819 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -385,20 +385,6 @@ void ceph_monc_renew_subs(struct ceph_mon_client *monc)
EXPORT_SYMBOL(ceph_monc_renew_subs);
/*
- * Register interest in the next osdmap
- */
-void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc)
-{
- dout("%s have %u\n", __func__, monc->subs[CEPH_SUB_OSDMAP].have);
- mutex_lock(&monc->mutex);
- if (__ceph_monc_want_map(monc, CEPH_SUB_OSDMAP,
- monc->subs[CEPH_SUB_OSDMAP].have + 1, false))
- __send_subscribe(monc);
- mutex_unlock(&monc->mutex);
-}
-EXPORT_SYMBOL(ceph_monc_request_next_osdmap);
-
-/*
* Wait for an osdmap with a given epoch.
*
* @epoch: epoch to wait for
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index ece2d10a1208..55cafd3a2ff0 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -3869,6 +3869,13 @@ void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc)
}
EXPORT_SYMBOL(ceph_osdc_flush_notifies);
+void ceph_osdc_maybe_request_map(struct ceph_osd_client *osdc)
+{
+ down_read(&osdc->lock);
+ maybe_request_map(osdc);
+ up_read(&osdc->lock);
+}
+EXPORT_SYMBOL(ceph_osdc_maybe_request_map);
/*
* init, shutdown