]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: snap_trimmer fix leaked lock
authorSamuel Just <samuel.just@dreamhost.com>
Thu, 3 Feb 2011 19:58:56 +0000 (11:58 -0800)
committerSamuel Just <samuel.just@dreamhost.com>
Thu, 3 Feb 2011 19:58:56 +0000 (11:58 -0800)
Previous patch 7a02070b741d3482ff6b28827c1eb274a2134486 leaks the pg
lock.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/ReplicatedPG.cc

index eb7358e6cf45a5963ac147029d3de2c24ae071ab..f636bd4e9797f204d212b847b98004ec9eb9c782 100644 (file)
@@ -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;