---

yaml --- r: 347605 b: refs/heads/master c: ed75ec2 h: refs/heads/master i: 347603: edf7461 v: v3
git-mirror · Dec 13, 2012 · 69646e8 · 69646e8
1 parent 1945fee
commit 69646e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e62ad30157d0da04cf40c6d1a2f4bc840948b9c
+refs/heads/master: ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
@@ -1876,9 +1876,14 @@ static int __do_request(struct ceph_mds_client *mdsc,
 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);
 	}