diff options
| author | Greg Kroah-Hartman | 2019-04-01 07:42:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-01 07:42:04 +0200 |
| commit | 8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905 (patch) | |
| tree | 26a36ec23067a9e26baf3d46c65f70619ca4d808 /include/linux/ceph/libceph.h | |
| parent | usb: introduce usb_ep_type_string() function (diff) | |
| parent | Linux 5.1-rc3 (diff) | |
| download | kernel-qcow2-linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.tar.gz kernel-qcow2-linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.tar.xz kernel-qcow2-linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.zip | |
Merge 5.1-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/ceph/libceph.h')
| -rw-r--r-- | include/linux/ceph/libceph.h | 2 |
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); |