From: Samuel Just <sam.just@inktank.com>
Date: Mon, 18 Mar 2013 23:14:35 +0000 (-0700)
Subject: OSD: move backfill_request_timer cleanup to OSDService::shutdown
X-Git-Tag: v0.62~191^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30b7a151f3376b3266c0b26992cc1b34ed5b2de9;p=ceph.git

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 ede9636c6ff5..5d362c4ce603 100644
--- 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();