---

yaml --- r: 373401 b: refs/heads/master c: 8058fd4 h: refs/heads/master i: 373399: a5fa9e2 v: v3
git-mirror · May 2, 2013 · 8f3d1c8 · 8f3d1c8
1 parent 8723c14
commit 8f3d1c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf53337af27a3ccc6e0f433b081063cdf0a2bf6
+refs/heads/master: 8058fd45039724695d5b67a574544452635d64a9
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
@@ -1337,8 +1337,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
 	req = __lookup_request(osdc, tid);
 	if (req == NULL) {
 		dout("handle_reply tid %llu dne\n", tid);
-		mutex_unlock(&osdc->request_mutex);
-		return;
+		goto bad_mutex;
 	}
 	ceph_osdc_get_request(req);
 
@@ -1437,6 +1436,8 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
 
 bad_put:
 	ceph_osdc_put_request(req);
+bad_mutex:
+	mutex_unlock(&osdc->request_mutex);
 bad:
 	pr_err("corrupt osd_op_reply got %d %d\n",
 	       (int)msg->front.iov_len, le32_to_cpu(msg->hdr.front_len));