diff options
| author | Sage Weil <sage@newdream.net> | 2010-05-05 15:51:35 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-05-17 15:25:31 -0700 |
| commit | 0f8605f2bde2c69737709765dfc574558ea35d4e (patch) | |
| tree | 77084c10be702d4c3e301686982b845e4eafb523 /fs/ceph | |
| parent | 31e0cf8f6a1488b6ca69dcdceeaed107ecfd6463 (diff) | |
| download | linux-stable-0f8605f2bde2c69737709765dfc574558ea35d4e.tar.gz linux-stable-0f8605f2bde2c69737709765dfc574558ea35d4e.tar.bz2 linux-stable-0f8605f2bde2c69737709765dfc574558ea35d4e.zip | |
ceph: clean up cap release loop vs spinlock
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/mds_client.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 0d451a83bc83..824a9b2cde71 100644 --- a/fs/ceph/mds_client.c +++ b/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); } |