From 4997ba2191a00a7b99804b4b4735f0a0bafef9b8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 May 2010 15:51:35 -0700 Subject: [PATCH] --- yaml --- r: 198074 b: refs/heads/master c: 0f8605f2bde2c69737709765dfc574558ea35d4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/mds_client.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cbcdcdce528e..b6115537cb65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31e0cf8f6a1488b6ca69dcdceeaed107ecfd6463 +refs/heads/master: 0f8605f2bde2c69737709765dfc574558ea35d4e diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index 0d451a83bc83..824a9b2cde71 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -1143,10 +1143,8 @@ static void send_cap_releases(struct ceph_mds_client *mdsc, struct ceph_msg *msg; dout("send_cap_releases mds%d\n", session->s_mds); - while (1) { - spin_lock(&session->s_cap_lock); - if (list_empty(&session->s_cap_releases_done)) - break; + spin_lock(&session->s_cap_lock); + while (!list_empty(&session->s_cap_releases_done)) { msg = list_first_entry(&session->s_cap_releases_done, struct ceph_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); dout("send_cap_releases mds%d %p\n", session->s_mds, msg); ceph_con_send(&session->s_con, msg); + spin_lock(&session->s_cap_lock); } spin_unlock(&session->s_cap_lock); }