From efb89f9fb0e39d43f64fd693d68dd4683669baf9 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 6 Nov 2008 13:58:10 -0800
Subject: [PATCH] osd: fix osd_lock recursion in wake_snap_trimmer

---
 src/osd/OSD.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ee735eac2588d..39eff90df4a1e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3320,7 +3320,7 @@ void OSD::wait_for_no_ops()
 
 void OSD::wake_snap_trimmer()
 {
-  osd_lock.Lock();
+  assert(osd_lock.is_locked());
   if (!snap_trimmer_thread.is_started()) {
     dout(10) << "wake_snap_trimmer - creating thread" << dendl;
     snap_trimmer_thread.create();
@@ -3328,7 +3328,6 @@ void OSD::wake_snap_trimmer()
     dout(10) << "wake_snap_trimmer - kicking thread" << dendl;
     snap_trimmer_cond.Signal();
   }
-  osd_lock.Unlock();  
 }
 
 void OSD::snap_trimmer()
-- 
2.47.3