---

yaml --- r: 188573 b: refs/heads/master c: 266673d h: refs/heads/master i: 188571: eeac914 v: v3
git-mirror · Oct 9, 2009 · f500e3c · f500e3c
1 parent 1da5ab7
commit f500e3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b024e70fed635a2cf5a4bf911db1649bb005f5
+refs/heads/master: 266673db423e6ab247170d6c6d72ec36e530a911
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
@@ -813,10 +813,13 @@ static void kick_requests(struct ceph_osd_client *osdc,
 
 		if (req->r_resend) {
 			dout(" r_resend set on tid %llu\n", req->r_tid);
+			__cancel_request(req);
 			goto kick;
 		}
-		if (req->r_osd && kickosd == req->r_osd)
+		if (req->r_osd && kickosd == req->r_osd) {
+			__cancel_request(req);
 			goto kick;
+		}
 
 		err = __map_osds(osdc, req);
 		if (err == 0)