Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6044cde6 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Yan, Zheng
Browse files

libceph: add ceph_monc_wait_osdmap() 



Add ceph_monc_wait_osdmap(), which will block until the osdmap with the
specified epoch is received or timeout occurs.

Export both of these as they are going to be needed by rbd.

Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 513a8243

include/linux/ceph/mon_client.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ extern int ceph_monc_got_mdsmap(struct ceph_mon_client *monc, u32 have); 
extern int ceph_monc_got_osdmap(struct ceph_mon_client *monc, u32 have);



extern void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc);

extern int ceph_monc_wait_osdmap(struct ceph_mon_client *monc, u32 epoch,

				 unsigned long timeout);



extern int ceph_monc_do_statfs(struct ceph_mon_client *monc,

			       struct ceph_statfs *buf);

net/ceph/mon_client.c

+27 −0
Original line number Diff line number Diff line
@@ -296,6 +296,33 @@ void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc) 
		__send_subscribe(monc);

	mutex_unlock(&monc->mutex);

}

EXPORT_SYMBOL(ceph_monc_request_next_osdmap);



int ceph_monc_wait_osdmap(struct ceph_mon_client *monc, u32 epoch,

			  unsigned long timeout)

{

	unsigned long started = jiffies;

	int ret;



	mutex_lock(&monc->mutex);

	while (monc->have_osdmap < epoch) {

		mutex_unlock(&monc->mutex);



		if (timeout != 0 && time_after_eq(jiffies, started + timeout))

			return -ETIMEDOUT;



		ret = wait_event_interruptible_timeout(monc->client->auth_wq,

					 monc->have_osdmap >= epoch, timeout);

		if (ret < 0)

			return ret;



		mutex_lock(&monc->mutex);

	}



	mutex_unlock(&monc->mutex);

	return 0;

}

EXPORT_SYMBOL(ceph_monc_wait_osdmap);



/*

 *