summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-23 18:04:47 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-23 18:04:47 +0100
commit9a1050ad83e2a5db84436b11e10facd7d4a5ab26 (patch)
tree46045735b06ac1b5bffe620f48e98c406350720a /include
parentMerge tag 'powerpc-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff)
parentrbd: drop wait_for_latest_osdmap() (diff)
downloadlinux-9a1050ad83e2a5db84436b11e10facd7d4a5ab26.tar.xz
linux-9a1050ad83e2a5db84436b11e10facd7d4a5ab26.zip
Merge tag 'ceph-for-5.1-rc2' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov: "A follow up for the new alloc_size logic and a blacklisting fix, marked for stable" * tag 'ceph-for-5.1-rc2' of git://github.com/ceph/ceph-client: rbd: drop wait_for_latest_osdmap() libceph: wait for latest osdmap in ceph_monc_blacklist_add() rbd: set io_min, io_opt and discard_granularity to alloc_size
Diffstat (limited to 'include')
-rw-r--r--include/linux/ceph/libceph.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index a420c07904bc..337d5049ff93 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -294,6 +294,8 @@ extern void ceph_destroy_client(struct ceph_client *client);
extern int __ceph_open_session(struct ceph_client *client,
unsigned long started);
extern int ceph_open_session(struct ceph_client *client);
+int ceph_wait_for_latest_osdmap(struct ceph_client *client,
+ unsigned long timeout);
/* pagevec.c */
extern void ceph_release_page_vector(struct page **pages, int num_pages);