lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libceph: drop mutex on error in handle_reply()

Browse Source 
The osd client mutex is acquired just before getting a reference to
a request in handle_reply().  However the error paths after that
don't drop the mutex before returning as they should.

Drop the mutex after dropping the request reference.  Also add a
bad_mutex label at that point and use it so the failed request
lookup case can be handled with the rest.

This resolves:
    http://tracker.ceph.com/issues/4615

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Alex Elder
2013-04-01 18:58:26 -05:00
committed by Sage Weil
parent 3bf53337af
commit 8058fd4503
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/ceph/osd_client.c
View File

@@ -1337,8 +1337,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
req = __lookup_request(osdc, tid); req = __lookup_request(osdc, tid);
if (req == NULL) { if (req == NULL) {
dout("handle_reply tid %llu dne\n", tid); dout("handle_reply tid %llu dne\n", tid);
mutex_unlock(&osdc->request_mutex); goto bad_mutex;
return;
} }
ceph_osdc_get_request(req); ceph_osdc_get_request(req);
@@ -1437,6 +1436,8 @@ done:
bad_put: bad_put:
ceph_osdc_put_request(req); ceph_osdc_put_request(req);
bad_mutex:
mutex_unlock(&osdc->request_mutex);
bad: bad:
pr_err("corrupt osd_op_reply got %d %d\n", pr_err("corrupt osd_op_reply got %d %d\n",
(int)msg->front.iov_len, le32_to_cpu(msg->hdr.front_len)); (int)msg->front.iov_len, le32_to_cpu(msg->hdr.front_len));