---

yaml --- r: 188666 b: refs/heads/master c: 529cfcc h: refs/heads/master v: v3
git-mirror · Dec 23, 2009 · 22373fa · 22373fa
1 parent badd695
commit 22373fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e3271074e1ebd0b80a912a457ce03c971bcd66
+refs/heads/master: 529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
@@ -1071,8 +1071,9 @@ int ceph_osdc_wait_request(struct ceph_osd_client *osdc,
 	if (rc < 0) {
 		mutex_lock(&osdc->request_mutex);
 		__cancel_request(req);
+		__unregister_request(osdc, req);
 		mutex_unlock(&osdc->request_mutex);
-		dout("wait_request tid %llu timed out\n", req->r_tid);
+		dout("wait_request tid %llu canceled/timed out\n", req->r_tid);
 		return rc;
 	}