osd/osd_types: move coll_t::META_COLL definition

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b7782471f5983dc55fc0f6661306542c6145c738..90195a6c113bd5fdbd0ffb1032d6cdb9b9a9ac30 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -134,8 +134,6 @@ static ostream& _prefix(std::ostream* _dout, int whoami, OSDMapRef osdmap) {
                << " ";
 }
 
-const coll_t coll_t::META_COLL("meta");
-
 static CompatSet get_osd_compat_set() {
   CompatSet::FeatureSet ceph_osd_feature_compat;
   CompatSet::FeatureSet ceph_osd_feature_ro_compat;

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 589236cb75f2ee55fbd2926865ebd024a9a25976..717f88c4e4ae08b002c30d844c168bbb1498d676 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -175,8 +175,6 @@ class HistoricOpsSocketHook;
 class TestOpsSocketHook;
 struct C_CompleteSplits;
 
-extern const coll_t meta_coll;
-
 typedef std::tr1::shared_ptr<ObjectStore::Sequencer> SequencerRef;
 
 class DeletingState {

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 3451d520ff2805b2f1726bfd0b40c84aef5ac931..db9dada6f5ac5fb5eaed8c2bbe08c925d00cdb3d 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -358,6 +358,8 @@ ostream& operator<<(ostream& out, const pg_t &pg)
 
 // -- coll_t --
 
+const coll_t coll_t::META_COLL("meta");
+
 bool coll_t::is_temp(pg_t& pgid) const
 {
   const char *cstr(str.c_str());