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

Commit f9d25199 authored by Alex Elder's avatar Alex Elder
Browse files

libceph: lock outside send_queued() 



Two of the three callers of the osd client's send_queued() function
already hold the osd client mutex and drop it before the call.

Change send_queued() so it assumes the caller holds the mutex, and
update all callers accordingly.  Rename it __send_queued() to match
the convention used elsewhere in the file with respect to the lock.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent a3bea47e

net/ceph/osd_client.c

+9 −10
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 




static const struct ceph_connection_operations osd_con_ops;

static const struct ceph_connection_operations osd_con_ops;





static void send_queued(struct ceph_osd_client *osdc);

static void __send_queued(struct ceph_osd_client *osdc);

static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd);

static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd);

static void __register_request(struct ceph_osd_client *osdc,

static void __register_request(struct ceph_osd_client *osdc,

			       struct ceph_osd_request *req);

			       struct ceph_osd_request *req);
@@ -554,8 +554,8 @@ static void osd_reset(struct ceph_connection *con) 
	down_read(&osdc->map_sem);

	down_read(&osdc->map_sem);

	mutex_lock(&osdc->request_mutex);

	mutex_lock(&osdc->request_mutex);

	__kick_osd_requests(osdc, osd);

	__kick_osd_requests(osdc, osd);

	__send_queued(osdc);

	mutex_unlock(&osdc->request_mutex);

	mutex_unlock(&osdc->request_mutex);

	send_queued(osdc);

	up_read(&osdc->map_sem);

	up_read(&osdc->map_sem);

}

}
@@ -997,17 +997,14 @@ static void __send_request(struct ceph_osd_client *osdc, 
/*

/*

 * Send any requests in the queue (req_unsent).

 * Send any requests in the queue (req_unsent).

 */

 */

static void send_queued(struct ceph_osd_client *osdc)

static void __send_queued(struct ceph_osd_client *osdc)

{

{

	struct ceph_osd_request *req, *tmp;

	struct ceph_osd_request *req, *tmp;





	dout("send_queued\n");

	dout("__send_queued\n");

	mutex_lock(&osdc->request_mutex);

	list_for_each_entry_safe(req, tmp, &osdc->req_unsent, r_req_lru_item)

	list_for_each_entry_safe(req, tmp, &osdc->req_unsent, r_req_lru_item) {

		__send_request(osdc, req);

		__send_request(osdc, req);

}

}

	mutex_unlock(&osdc->request_mutex);

}





/*

/*

 * Timeout callback, called every N seconds when 1 or more osd

 * Timeout callback, called every N seconds when 1 or more osd
@@ -1058,8 +1055,8 @@ static void handle_timeout(struct work_struct *work) 
	}

	}





	__schedule_osd_timeout(osdc);

	__schedule_osd_timeout(osdc);

	__send_queued(osdc);

	mutex_unlock(&osdc->request_mutex);

	mutex_unlock(&osdc->request_mutex);

	send_queued(osdc);

	up_read(&osdc->map_sem);

	up_read(&osdc->map_sem);

}

}
@@ -1397,7 +1394,9 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) 
	if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL))

	if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL))

		ceph_monc_request_next_osdmap(&osdc->client->monc);

		ceph_monc_request_next_osdmap(&osdc->client->monc);





	send_queued(osdc);

	mutex_lock(&osdc->request_mutex);

	__send_queued(osdc);

	mutex_unlock(&osdc->request_mutex);

	up_read(&osdc->map_sem);

	up_read(&osdc->map_sem);

	wake_up_all(&osdc->client->auth_wq);

	wake_up_all(&osdc->client->auth_wq);

	return;

	return;