From f74f603d2a39b4b39e1aaa48e088560a6323559b Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Mon, 12 Sep 2011 14:25:17 -0700 Subject: [PATCH] get_*_compat_set: get ctor param ordering right Signed-off-by: Colin McCabe --- src/mds/MDSMap.cc | 4 ++-- src/osd/OSD.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index c3f08c43cff87..d0997e6e2c4f1 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -22,14 +22,14 @@ using std::stringstream; // features CompatSet get_mdsmap_compat_set() { CompatSet::FeatureSet feature_compat; + CompatSet::FeatureSet feature_ro_compat; CompatSet::FeatureSet feature_incompat; feature_incompat.insert(MDS_FEATURE_INCOMPAT_BASE); feature_incompat.insert(MDS_FEATURE_INCOMPAT_CLIENTRANGES); feature_incompat.insert(MDS_FEATURE_INCOMPAT_FILELAYOUT); feature_incompat.insert(MDS_FEATURE_INCOMPAT_DIRINODE); - CompatSet::FeatureSet feature_ro_compat; - return CompatSet(feature_compat, feature_incompat, feature_ro_compat); + return CompatSet(feature_compat, feature_ro_compat, feature_incompat); } // base (pre v0.20) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index da32a4e2e8715..4f4245ed266ae 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -115,15 +115,15 @@ const coll_t coll_t::TEMP_COLL("temp"); static CompatSet get_osd_compat_set() { CompatSet::FeatureSet ceph_osd_feature_compat; + CompatSet::FeatureSet ceph_osd_feature_ro_compat; CompatSet::FeatureSet ceph_osd_feature_incompat; ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_BASE); ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_PGINFO); ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_OLOC); ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEC); ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_CATEGORIES); - CompatSet::FeatureSet ceph_osd_feature_ro_compat; - return CompatSet(ceph_osd_feature_compat, ceph_osd_feature_incompat, - ceph_osd_feature_ro_compat); + return CompatSet(ceph_osd_feature_compat, ceph_osd_feature_ro_compat, + ceph_osd_feature_incompat); } ObjectStore *OSD::create_object_store(const std::string &dev, const std::string &jdev) -- 2.39.5