ceph: unregister canceled/timed out osd requests

Canceled or timed out osd requests were getting left in the request list
and never deallocated (until umount).  Unregister if they are canceled
(control-c) or time out.

Signed-off-by: Sage Weil <sage@newdream.net>

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index b474b3ad61f0..a1800fb63237 100644
--- a/fs/ceph/osd_client.c
+++ b/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;
         }