OSD: move backfill_request_timer cleanup to OSDService::shutdown

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ede9636c6ff5021a5d9af0d9c068dca0f459a3f9..5d362c4ce603302981db1b3b12864cd970f7bf46 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -258,9 +258,14 @@ void OSDService::pg_stat_queue_dequeue(PG *pg)
 void OSDService::shutdown()
 {
   reserver_finisher.stop();
-  watch_lock.Lock();
-  watch_timer.shutdown();
-  watch_lock.Unlock();
+  {
+    Mutex::Locker l(watch_lock);
+    watch_timer.shutdown();
+  }
+  {
+    Mutex::Locker l(backfill_request_lock);
+    backfill_request_timer.shutdown();
+  }
 }
 
 void OSDService::init()
@@ -1182,10 +1187,6 @@ int OSD::shutdown()
 
   timer.shutdown();
 
-  service.backfill_request_lock.Lock();
-  service.backfill_request_timer.shutdown();
-  service.backfill_request_lock.Unlock();
-
   heartbeat_lock.Lock();
   heartbeat_stop = true;
   heartbeat_cond.Signal();