From: Samuel Just <sjust@redhat.com>
Date: Fri, 30 Jan 2015 20:54:47 +0000 (-0800)
Subject: ReplicatedPG::C_ProxyRead: fix dropped lock
X-Git-Tag: v0.93~126^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77689f18ad1728b3d87646927eba190bb14d65c2;p=ceph.git

ReplicatedPG::C_ProxyRead: fix dropped lock

Fixes: 10633
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 30638cc7608d9..34cffc43196f3 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1951,8 +1951,10 @@ struct C_ProxyRead : public Context {
     if (prdop->canceled)
       return;
     pg->lock();
-    if (prdop->canceled)
+    if (prdop->canceled) {
+      pg->unlock();
       return;
+    }
     if (last_peering_reset == pg->get_last_peering_reset()) {
       pg->finish_proxy_read(oid, tid, r);
     }