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

Commit e10006f8 authored by Alex Elder's avatar Alex Elder Committed by Alex Elder
Browse files

libceph: provide osd number when creating osd 



Pass the osd number to the create_osd() routine, and move the
initialization of fields that depend on it therein.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent ce2c8903

net/ceph/osd_client.c

+4 −4
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static void osd_reset(struct ceph_connection *con) 
/*

 * Track open sessions with osds.

 */

static struct ceph_osd *create_osd(struct ceph_osd_client *osdc)

static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)

{

	struct ceph_osd *osd;
@@ -634,6 +634,7 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc) 


	atomic_set(&osd->o_ref, 1);

	osd->o_osdc = osdc;

	osd->o_osd = onum;

	INIT_LIST_HEAD(&osd->o_requests);

	INIT_LIST_HEAD(&osd->o_linger_requests);

	INIT_LIST_HEAD(&osd->o_osd_lru);
@@ -643,6 +644,7 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc) 
	osd->o_con.private = osd;

	osd->o_con.ops = &osd_con_ops;

	osd->o_con.peer_name.type = CEPH_ENTITY_TYPE_OSD;

	osd->o_con.peer_name.num = cpu_to_le64(onum);



	INIT_LIST_HEAD(&osd->o_keepalive_item);

	return osd;
@@ -998,15 +1000,13 @@ static int __map_request(struct ceph_osd_client *osdc, 
	req->r_osd = __lookup_osd(osdc, o);

	if (!req->r_osd && o >= 0) {

		err = -ENOMEM;

		req->r_osd = create_osd(osdc);

		req->r_osd = create_osd(osdc, o);

		if (!req->r_osd) {

			list_move(&req->r_req_lru_item, &osdc->req_notarget);

			goto out;

		}



		dout("map_request osd %p is osd%d\n", req->r_osd, o);

		req->r_osd->o_osd = o;

		req->r_osd->o_con.peer_name.num = cpu_to_le64(o);

		__insert_osd(osdc, req->r_osd);



		ceph_con_open(&req->r_osd->o_con, &osdc->osdmap->osd_addr[o]);