osd: put meta_coll const in OSD.{cc,h}

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c28c63804bfd379cfb1870c8cb035e89b1b97352..8236fb0e197751f6dba007e1a5e80f2740e7193d 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -104,6 +104,9 @@ static ostream& _prefix(ostream& out, int whoami, OSDMap *osdmap) {
 }
 
 
+const coll_t meta_coll;
+
+
 ObjectStore *OSD::create_object_store(const char *dev, const char *jdev)
 {
   struct stat st;

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 93a9942ec4a46a57162189b9d0cd36c186176dbd..8ed3fb39953ad3c7c079289feadb27e0c33faebe 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -92,6 +92,7 @@ class OSDMap;
 class MLog;
 class MClass;
 
+extern const coll_t meta_coll;
 
 class OSD : public Dispatcher {
   /** OSD **/

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 9dbb4d984efe7f4841036dc3374a7166f848352e..3b920ffc65361102b8d960d28a020b85960497e4 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -309,9 +309,6 @@ namespace __gnu_cxx {
 }
 
 
-const coll_t meta_coll;
-
-
 
 inline ostream& operator<<(ostream& out, const ceph_object_layout &ol)
 {