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

Commit 0f8605f2 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: clean up cap release loop vs spinlock 



Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 31e0cf8f

fs/ceph/mds_client.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -1143,10 +1143,8 @@ static void send_cap_releases(struct ceph_mds_client *mdsc, 
	struct ceph_msg *msg;

	struct ceph_msg *msg;





	dout("send_cap_releases mds%d\n", session->s_mds);

	dout("send_cap_releases mds%d\n", session->s_mds);

	while (1) {

	spin_lock(&session->s_cap_lock);

	spin_lock(&session->s_cap_lock);

		if (list_empty(&session->s_cap_releases_done))

	while (!list_empty(&session->s_cap_releases_done)) {

			break;

		msg = list_first_entry(&session->s_cap_releases_done,

		msg = list_first_entry(&session->s_cap_releases_done,

				 struct ceph_msg, list_head);

				 struct ceph_msg, list_head);

		list_del_init(&msg->list_head);

		list_del_init(&msg->list_head);
@@ -1154,6 +1152,7 @@ static void send_cap_releases(struct ceph_mds_client *mdsc, 
		msg->hdr.front_len = cpu_to_le32(msg->front.iov_len);

		msg->hdr.front_len = cpu_to_le32(msg->front.iov_len);

		dout("send_cap_releases mds%d %p\n", session->s_mds, msg);

		dout("send_cap_releases mds%d %p\n", session->s_mds, msg);

		ceph_con_send(&session->s_con, msg);

		ceph_con_send(&session->s_con, msg);

		spin_lock(&session->s_cap_lock);

	}

	}

	spin_unlock(&session->s_cap_lock);

	spin_unlock(&session->s_cap_lock);

}

}