diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-03 15:23:50 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-11 15:19:18 -0700 |
| commit | 6cecd0db5686bd32cd3050bb7ed2558f2db117e8 (patch) | |
| tree | 8dc8355362647c5878a21985b4401b45271ba9c6 | |
| parent | 17c5d765d7c7573f875f6b3ba66e3b6813110a06 (diff) | |
| download | ceph-6cecd0db5686bd32cd3050bb7ed2558f2db117e8.tar.gz | |
osd/osd_types: move coll_t::META_COLL definition
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/OSD.cc | 2 | ||||
| -rw-r--r-- | src/osd/OSD.h | 2 | ||||
| -rw-r--r-- | src/osd/osd_types.cc | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index b7782471f59..90195a6c113 100644 --- 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 589236cb75f..717f88c4e4a 100644 --- 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 3451d520ff2..db9dada6f5a 100644 --- 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()); |