From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 12 Feb 2012 22:12:44 +0000 (-0800)
Subject: mds: remove some cruft
X-Git-Tag: v0.43~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec066829a7da19f8d3212b2e5238bcded8f50ba7;p=ceph.git

mds: remove some cruft

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index cc5609aa60b..dd56136aeb1 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -579,8 +579,6 @@ void MDS::tick()
 void MDS::beacon_start()
 {
   beacon_send();         // send first beacon
-  
-  //reset_beacon_killer(); // schedule killer
 }
   
 
@@ -1542,7 +1540,7 @@ void MDS::suicide()
     tick_event = 0;
   }
   timer.cancel_all_events();
-  //timer.join();  // this will deadlock from beacon_kill -> suicide
+  //timer.join();
   
   // shut down cache
   mdcache->shutdown();