From 9e4027fbfe2c54c73e6e33089e400a9e4d98bcf0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Nov 2010 13:13:38 -0800
Subject: [PATCH] monc: cancel timer events with lock held

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/mon/MonClient.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index d320b3b55cb9a..0f6c412930fae 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -309,7 +309,9 @@ void MonClient::init()
 
 void MonClient::shutdown()
 {
+  monc_lock.Lock();
   timer->cancel_all_events();
+  monc_lock.Unlock();
 }
 
 int MonClient::authenticate(double timeout)
-- 
2.39.5