get_*_compat_set: get ctor param ordering right

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

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index c3f08c43cff870a5edf1bc02896d67ec0a92b2b5..d0997e6e2c4f150ca5d1f51235db61b17ffaa170 100644 (file)
--- 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 da32a4e2e8715d630ad0717c4ed6f152eda06e54..4f4245ed266aea3a711cbe96ce1be6083b7a3ff3 100644 (file)
--- 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)