From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Aug 2014 18:23:33 +0000 (-0700)
Subject: os/MemStore: fix lock leak
X-Git-Tag: v0.84~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e36babc825caf2e6836649308ac431b5dccc83c5;p=ceph.git

os/MemStore: fix lock leak

CID 1228868 (#2-1 of 2): Missing unlock (LOCK)
12. missing_unlock: Returning without unlocking oc->lock.L.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/MemStore.cc b/src/os/MemStore.cc
index 9b496e24b013..3fdab0f0c27f 100644
--- a/src/os/MemStore.cc
+++ b/src/os/MemStore.cc
@@ -1404,7 +1404,7 @@ int MemStore::_collection_move_rename(coll_t oldcid, const ghobject_t& oldoid,
   r = 0;
  out:
   c->lock.put_write();
-  if (c != oc)
+  if (&(*c) != &(*oc))
     oc->lock.put_write();
   return r;
 }