From 400813cc411f80ac4ae41bb7e2854f28a2d5c033 Mon Sep 17 00:00:00 2001
From: Samuel Just <samuel.just@dreamhost.com>
Date: Thu, 3 Feb 2011 11:58:56 -0800
Subject: [PATCH] ReplicatedPG: snap_trimmer fix leaked lock

Previous patch 7a02070b741d3482ff6b28827c1eb274a2134486 leaks the pg
lock.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
---
 src/osd/ReplicatedPG.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index eb7358e6cf45..f636bd4e9797 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -526,7 +526,10 @@ void ReplicatedPG::do_sub_op_reply(MOSDSubOpReply *r)
 bool ReplicatedPG::snap_trimmer()
 {
   lock();
-  if (!(is_primary() && is_clean() && is_active())) return true;
+  if (!(is_primary() && is_clean() && is_active())) {
+    unlock();
+    return true;
+  }
   dout(10) << "snap_trimmer start, purged_snaps " << info.purged_snaps << dendl;
 
   interval_set<snapid_t> s;
-- 
2.47.3