From: John Spray <john.spray@redhat.com>
Date: Tue, 15 Mar 2016 13:27:21 +0000 (+0000)
Subject: mds: pass features through to MDSMap::encode
X-Git-Tag: v10.1.1~114^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99dd53d1ae78a834bb88ddf43893abe42814e349;p=ceph.git

mds: pass features through to MDSMap::encode

...from Filesystem.  This will prepare us for if
MDSMap gets any more feature-sensitive encoding
in the future.

Fixes: #15062
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index cf8c7aed30aa..482ef0023081 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -223,7 +223,7 @@ void FSMap::encode(bufferlist& bl, uint64_t features) const
   for (auto i : filesystems) {
     fs_list.push_back(*(i.second));
   }
-  ::encode(fs_list, bl);
+  ::encode(fs_list, bl, features);
   ::encode(mds_roles, bl);
   ::encode(standby_daemons, bl, features);
   ::encode(standby_epochs, bl);
@@ -383,12 +383,12 @@ void FSMap::decode(bufferlist::iterator& p)
 }
 
 
-void Filesystem::encode(bufferlist& bl) const
+void Filesystem::encode(bufferlist& bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
   ::encode(fscid, bl);
   bufferlist mdsmap_bl;
-  mds_map.encode(mdsmap_bl, CEPH_FEATURE_PGID64 | CEPH_FEATURE_MDSENC);
+  mds_map.encode(mdsmap_bl, features);
   ::encode(mdsmap_bl, bl);
   ENCODE_FINISH(bl);
 }
diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h
index 246e7096db6b..1f6b069df25f 100644
--- a/src/mds/FSMap.h
+++ b/src/mds/FSMap.h
@@ -57,7 +57,7 @@ class Filesystem
   fs_cluster_id_t fscid;
   MDSMap mds_map;
 
-  void encode(bufferlist& bl) const;
+  void encode(bufferlist& bl, uint64_t features) const;
   void decode(bufferlist::iterator& p);
 
   Filesystem()
@@ -86,7 +86,7 @@ class Filesystem
     return false;
   }
 };
-WRITE_CLASS_ENCODER(Filesystem)
+WRITE_CLASS_ENCODER_FEATURES(Filesystem)
 
 class FSMap {
 protected: