Commit 529cfcc4 authored by Sage Weil's avatar Sage Weil
Browse files

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: default avatarSage Weil <sage@newdream.net>
parent e0e32710

fs/ceph/osd_client.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}