diff options
| author | Sage Weil | 2009-12-22 19:29:39 +0100 |
|---|---|---|
| committer | Sage Weil | 2009-12-23 17:17:19 +0100 |
| commit | 529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4 (patch) | |
| tree | 4666fb5c64a1e2d0ebcc8dff5825a882aff86796 /fs/ceph/osd_client.c | |
| parent | ceph: only unregister registered bdi (diff) | |
| download | kernel-qcow2-linux-529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4.tar.gz kernel-qcow2-linux-529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4.tar.xz kernel-qcow2-linux-529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4.zip | |
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>
Diffstat (limited to 'fs/ceph/osd_client.c')
| -rw-r--r-- | fs/ceph/osd_client.c | 3 |
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; } |