common: config.cc: de-globalize g_fake_kill_after

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/config.cc b/src/config.cc
index 5ab95ddf9de723e6692b4e4a7d6269e04e595b1f..ab58b9c8638bf1ee464413dca9bf94460c723459 100644 (file)
--- 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 e63d98ca84f7fd434824f339dd58b37ea73c47d7..30dcf98e6f534d29fb2bd8e64809a16eda40a614 100644 (file)
--- 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;