osd: fix osd_lock recursion in wake_snap_trimmer

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ee735eac2588d446c0dab873fde570d214cbff51..39eff90df4a1e8dae5d4e11147ba27f4236b884c 100644 (file)
--- 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()