From: John Spray <john.spray@redhat.com>
Date: Sun, 24 Aug 2014 17:17:59 +0000 (+0100)
Subject: test: fix prematurely released lock in RadosModel
X-Git-Tag: v0.86~213^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d1b295bc8049c809f859414104fd4ba1bfea1f4;p=ceph.git

test: fix prematurely released lock in RadosModel

Should hold this lock while touching context->snaps.  Don't
think this has anything to do with #9203 though.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index af8e4bbcd9979..55347bd5e4579 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -1244,7 +1244,6 @@ public:
     context->state_lock.Lock();
     uint64_t snap = context->snaps[to_remove];
     context->remove_snap(to_remove);
-    context->state_lock.Unlock();
 
     if (context->pool_snaps) {
       string snapname;
@@ -1268,6 +1267,7 @@ public:
 	assert(0);
       }
     }
+    context->state_lock.Unlock();
   }
 
   string getType()