diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2012-11-19 10:49:06 +0800 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-12-13 08:13:07 -0600 |
| commit | ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34 (patch) | |
| tree | 570f74b490afdbe623785124ec3186ae5a012d53 /fs/ceph | |
| parent | 5e62ad30157d0da04cf40c6d1a2f4bc840948b9c (diff) | |
| download | linux-ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34.tar.gz linux-ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34.tar.bz2 linux-ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34.zip | |
ceph: Fix infinite loop in __wake_requests
__wake_requests() will enter infinite loop if we use it to wake
requests in the session->s_waiting list. __wake_requests() deletes
requests from the list and __do_request() adds requests back to
the list.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/mds_client.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 62d2342eb267..9165eb8309eb 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1876,9 +1876,14 @@ finish: static void __wake_requests(struct ceph_mds_client *mdsc, struct list_head *head) { - struct ceph_mds_request *req, *nreq; + struct ceph_mds_request *req; + LIST_HEAD(tmp_list); + + list_splice_init(head, &tmp_list); - list_for_each_entry_safe(req, nreq, head, r_wait) { + while (!list_empty(&tmp_list)) { + req = list_entry(tmp_list.next, + struct ceph_mds_request, r_wait); list_del_init(&req->r_wait); __do_request(mdsc, req); } |