From a4375329b0e4214a2432475a604090d7ef8b8f51 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 1 Feb 2011 08:33:29 -0800
Subject: [PATCH] common: config.cc: de-globalize g_fake_kill_after

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 src/config.cc            | 7 -------
 src/msg/FakeMessenger.cc | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/config.cc b/src/config.cc
index 5ab95ddf9de72..ab58b9c8638bf 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -84,13 +84,6 @@ struct ceph_file_layout g_default_file_layout = {
  fl_object_stripe_unit: init_le32(0),
 };
 
-
-
-#include <msg/msg_types.h>
-
-// fake osd failures: osd -> time
-std::map<entity_name_t,float> g_fake_kill_after;
-
 md_config_t g_conf;
 
 #include <stdlib.h>
diff --git a/src/msg/FakeMessenger.cc b/src/msg/FakeMessenger.cc
index e63d98ca84f7f..30dcf98e6f534 100644
--- a/src/msg/FakeMessenger.cc
+++ b/src/msg/FakeMessenger.cc
@@ -60,7 +60,9 @@ bool      awake = false;
 bool      fm_shutdown = false;
 pthread_t thread_id;
 
-extern std::map<entity_name_t,float> g_fake_kill_after;  // in config.cc
+// fake osd failures: osd -> time
+static std::map<entity_name_t,float> g_fake_kill_after;
+
 utime_t start_time;
 map<utime_t,entity_name_t> fail_queue;
 list<Message*> sent_to_failed_queue;
-- 
2.39.5