msg: pass features explicitly into message encoders

Avoid using the connection reference; pass it in explicitly instead.  This
will make ceph-dencoder's life a bit easier.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

99 files changed, 101 insertions, 101 deletions

diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h
index 631f80cef49..7fc0e59036c 100644
--- a/src/messages/MAuth.h
+++ b/src/messages/MAuth.h
@@ -45,7 +45,7 @@ public:
     else
       monmap_epoch = 0;
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(protocol, payload);
     ::encode(auth_payload, payload);
diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h
index 9066064fc2f..7a219a3cb23 100644
--- a/src/messages/MAuthReply.h
+++ b/src/messages/MAuthReply.h
@@ -53,7 +53,7 @@ public:
     ::decode(result_bl, p);
     ::decode(result_msg, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(protocol, payload);
     ::encode(result, payload);
     ::encode(global_id, payload);
diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index 5bf36978967..e562a83069a 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -75,7 +75,7 @@ public:
     ::decode(realms, p);
   }
     
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(from, payload);
     ::encode(realms, payload);
   }
diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
index ad054ce2f31..a25b4afb5bc 100644
--- a/src/messages/MClientCapRelease.h
+++ b/src/messages/MClientCapRelease.h
@@ -41,7 +41,7 @@ public:
     ::decode(head, p);
     ::decode_nohead(head.num, caps, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.num = caps.size();
     ::encode(head, payload);
     ::encode_nohead(caps, payload);
diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index 572a2b7e4ee..0037850c3f8 100644
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -147,7 +147,7 @@ public:
     if (header.version >= 2)
       ::decode(flockbl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.snap_trace_len = snapbl.length();
     head.xattr_len = xattrbl.length();
     ::encode(head, payload);
diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
index c10bb470a1d..e87d7c58205 100644
--- a/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@ -73,7 +73,7 @@ public:
     ::decode(h, p);
     ::decode(dname, p);
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(h, payload);
     ::encode(dname, payload);
   }
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index fdc2600699d..14e5f1ffe9f 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -49,8 +49,8 @@ public:
     realms.push_back(r);
   }
 
-  void encode_payload(CephContext *cct) {
     if (connection->has_feature(CEPH_FEATURE_FLOCK)) {
+  void encode_payload(CephContext *cct, uint64_t features) {
       // new protocol
       header.version = 2;
       ::encode(caps, data);
diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 10090449476..88c7b5ababd 100644
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -238,7 +238,7 @@ public:
     ::decode(snapbl, p);
     assert(p.end());
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(head, payload);
     ::encode(trace_bl, payload);
     ::encode(extra_bl, payload);
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index 51f55343dae..360c05051a1 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -149,7 +149,7 @@ public:
     ::decode_nohead(head.num_releases, releases, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.num_releases = releases.size();
     ::encode(head, payload);
     ::encode(path, payload);
diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h
index fba5e124f1e..62fca8df75b 100644
--- a/src/messages/MClientRequestForward.h
+++ b/src/messages/MClientRequestForward.h
@@ -46,7 +46,7 @@ public:
       << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dest_mds, payload);
     ::encode(num_fwd, payload);
     ::encode(client_must_resend, payload);
diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
index 7c8728195f4..54411fe6ce6 100644
--- a/src/messages/MClientSession.h
+++ b/src/messages/MClientSession.h
@@ -59,7 +59,7 @@ public:
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
   }
-  void encode_payload(CephContext *cct) { 
+  void encode_payload(CephContext *cct, uint64_t features) { 
     ::encode(head, payload);
   }
 };
diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
index 85d2257e171..7f662005308 100644
--- a/src/messages/MClientSnap.h
+++ b/src/messages/MClientSnap.h
@@ -43,7 +43,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.num_split_inos = split_inos.size();
     head.num_split_realms = split_realms.size();
     head.trace_len = bl.length();
diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h
index d9aa03f1e86..bcdb938eb4a 100644
--- a/src/messages/MCommand.h
+++ b/src/messages/MCommand.h
@@ -45,7 +45,7 @@ public:
     o << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }
diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
index 6b5ff245b5d..5196487f870 100644
--- a/src/messages/MCommandReply.h
+++ b/src/messages/MCommandReply.h
@@ -41,7 +41,7 @@ public:
     o << "command_reply(tid " << get_tid() << ": " << r << " " << rs << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(r, payload);
     ::encode(rs, payload);
   }
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index 72cedc923f9..d6286bb0793 100644
--- a/src/messages/MDentryLink.h
+++ b/src/messages/MDentryLink.h
@@ -51,7 +51,7 @@ public:
     ::decode(is_primary, p);
     ::decode(bl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(dn, payload);
     ::encode(is_primary, payload);
diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
index 49a181d52fa..4d047706719 100644
--- a/src/messages/MDentryUnlink.h
+++ b/src/messages/MDentryUnlink.h
@@ -47,7 +47,7 @@ public:
     ::decode(dn, p);
     ::decode(straybl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(dn, payload);
     ::encode(straybl, payload);
diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
index 5db7d9dc5c0..f26acd7a9d1 100644
--- a/src/messages/MDirUpdate.h
+++ b/src/messages/MDirUpdate.h
@@ -72,7 +72,7 @@ public:
     ::decode(path, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(from_mds, payload);
     ::encode(dirfrag, payload);
     ::encode(dir_rep, payload);
diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
index 6c4ff1b5342..0ee60a21616 100644
--- a/src/messages/MDiscover.h
+++ b/src/messages/MDiscover.h
@@ -88,7 +88,7 @@ public:
     ::decode(want_base_dir, p);
     ::decode(want_xlocked, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);
     ::encode(snapid, payload);
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index 92d1b0a50c4..96ac6752ed2 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -199,7 +199,7 @@ public:
     if (header.version >= 2)
       ::decode(wanted_ino, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);
diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
index 97b01caea78..ac8cc93f8b9 100644
--- a/src/messages/MExportCaps.h
+++ b/src/messages/MExportCaps.h
@@ -36,7 +36,7 @@ public:
     o << "export_caps(" << ino << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
     ::encode(cap_bl, payload);
     ::encode(client_map, payload);
diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
index 070601128ff..8ffdea660e2 100644
--- a/src/messages/MExportCapsAck.h
+++ b/src/messages/MExportCapsAck.h
@@ -36,7 +36,7 @@ public:
     o << "export_caps_ack(" << ino << ")";
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
   }
   virtual void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
index c2cb7ec82ba..a44ae6c507b 100644
--- a/src/messages/MExportDir.h
+++ b/src/messages/MExportDir.h
@@ -44,7 +44,7 @@ public:
     bounds.push_back(df); 
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(bounds, payload);
     ::encode(export_data, payload);
diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
index 126bcf0cde2..e95def9d6d1 100644
--- a/src/messages/MExportDirAck.h
+++ b/src/messages/MExportDirAck.h
@@ -39,7 +39,7 @@ public:
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
 
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index a0399995e1c..045b78a988d 100644
--- a/src/messages/MExportDirCancel.h
+++ b/src/messages/MExportDirCancel.h
@@ -37,7 +37,7 @@ public:
     o << "export_cancel(" << dirfrag << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index c7ac8a12a23..4c1e59b7e10 100644
--- a/src/messages/MExportDirDiscover.h
+++ b/src/messages/MExportDirDiscover.h
@@ -57,7 +57,7 @@ public:
     ::decode(path, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(from, payload);
     ::encode(dirfrag, payload);
     ::encode(path, payload);
diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
index ae2704cabb6..6fca62ab5aa 100644
--- a/src/messages/MExportDirDiscoverAck.h
+++ b/src/messages/MExportDirDiscoverAck.h
@@ -50,7 +50,7 @@ public:
     ::decode(dirfrag, p);
     ::decode(success, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(success, payload);
   }
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index 46c511f3f85..b6651f41643 100644
--- a/src/messages/MExportDirFinish.h
+++ b/src/messages/MExportDirFinish.h
@@ -37,7 +37,7 @@ public:
     o << "export_finish(" << dirfrag << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index 4ceb35b2c09..ea92a234496 100644
--- a/src/messages/MExportDirNotify.h
+++ b/src/messages/MExportDirNotify.h
@@ -59,7 +59,7 @@ public:
       bounds.push_back(*i);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(base, payload);
     ::encode(ack, payload);
     ::encode(old_auth, payload);
diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
index 9d82013efb5..ed7989aaa70 100644
--- a/src/messages/MExportDirNotifyAck.h
+++ b/src/messages/MExportDirNotifyAck.h
@@ -39,7 +39,7 @@ public:
     o << "export_notify_ack(" << dirfrag << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index 65b4e789d39..df46b802630 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -72,7 +72,7 @@ public:
     ::decode(bystanders, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(basedir, payload);
     ::encode(bounds, payload);
diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
index 5a8e5684c9e..1b3de01d80e 100644
--- a/src/messages/MExportDirPrepAck.h
+++ b/src/messages/MExportDirPrepAck.h
@@ -41,7 +41,7 @@ public:
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
 };
diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index 17ef0995948..b916f5bd893 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -46,11 +46,11 @@ private:
   }
 
 public:
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(tid, payload);
     ::encode(client, payload);
     ::encode(client_caps, payload);
-    encode_message(cct, msg, payload);
+    encode_message(cct, msg, features, payload);
   }
 
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
index 38a26d490c0..edeb8ae755e 100644
--- a/src/messages/MGenericMessage.h
+++ b/src/messages/MGenericMessage.h
@@ -33,7 +33,7 @@ class MGenericMessage : public Message {
   const char *get_type_name() { return tname; }
 
   void decode_payload(CephContext *cct) { }
-  void encode_payload(CephContext *cct) { }
+  void encode_payload(CephContext *cct, uint64_t features) { }
 };
 
 #endif
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
index d82b9bca024..4905e6feb1e 100644
--- a/src/messages/MGetPoolStats.h
+++ b/src/messages/MGetPoolStats.h
@@ -41,7 +41,7 @@ public:
     out << "getpoolstats(" << get_tid() << " " << pools << " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pools, payload);
diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
index 8713d5ab9f5..e5832bd7334 100644
--- a/src/messages/MGetPoolStatsReply.h
+++ b/src/messages/MGetPoolStatsReply.h
@@ -39,7 +39,7 @@ public:
     out << "getpoolstatsreply(" << get_tid() << " v" << version <<  ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pool_stats, payload);
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index abd4a19d3d1..e3bdf122044 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -48,7 +48,7 @@ private:
 public:
   const char *get_type_name() { return "HB"; }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(load, payload);
     ::encode(beat, payload);
     ::encode(import_map, payload);
diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index 0568303b215..58cf3837264 100644
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -39,7 +39,7 @@ public:
     out << "inode_file_caps(" << ino << " " << ccap_string(caps) << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
     ::encode(caps, payload);
   }
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index fa4d975f046..053efe8b281 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -81,7 +81,7 @@ public:
     ::decode(object_info, p);
     ::decode(lockdata, p);
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(asker, payload);
     ::encode(action, payload);
     ::encode(reqid, payload);
diff --git a/src/messages/MLog.h b/src/messages/MLog.h
index a7697f32ccb..0b3206f8829 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -42,7 +42,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(entries, payload);
diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
index da247c2d778..f3137499948 100644
--- a/src/messages/MLogAck.h
+++ b/src/messages/MLogAck.h
@@ -33,7 +33,7 @@ public:
     out << "log(last " << last << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(last, payload);
   }
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index c23559a200d..ca19828b7a9 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -67,7 +67,7 @@ public:
 	<< " seq " << seq << " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(fsid, payload);
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index cc8ee29a7ca..e8e09cb9cd7 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -271,7 +271,7 @@ public:
   }
 
   // -- encoding --
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(op, payload);
     ::encode(strong_inodes, payload);
     ::encode(inode_base, payload);
diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
index a5d707c10c0..2379efe8630 100644
--- a/src/messages/MMDSFindIno.h
+++ b/src/messages/MMDSFindIno.h
@@ -30,7 +30,7 @@ struct MMDSFindIno : public Message {
     out << "findino(" << tid << " " << ino << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(tid, payload);
     ::encode(ino, payload);
   }
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index 99149e58e65..91babc23d15 100644
--- a/src/messages/MMDSFindInoReply.h
+++ b/src/messages/MMDSFindInoReply.h
@@ -30,7 +30,7 @@ struct MMDSFindInoReply : public Message {
     out << "findinoreply(" << tid << " " << path << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(tid, payload);
     ::encode(path, payload);
   }
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index a9859509d79..fa90c84adb0 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -45,7 +45,7 @@ public:
       << " " << (int)bits << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
     ::encode(basefrag, payload);
     ::encode(bits, payload);
diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h
index 21709d55c12..225f7330a56 100644
--- a/src/messages/MMDSLoadTargets.h
+++ b/src/messages/MMDSLoadTargets.h
@@ -48,7 +48,7 @@ public:
     ::decode(targets, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(global_id, payload);
     ::encode(targets, payload);
diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index 3c573f5df3f..390312b2da7 100644
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -79,7 +79,7 @@ public:
     ::decode(epoch, p);
     ::decode(encoded, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(epoch, payload);
     if (connection && !connection->has_feature(CEPH_FEATURE_PGID64)) {
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index 96989aedad4..2436b696d18 100644
--- a/src/messages/MMDSResolve.h
+++ b/src/messages/MMDSResolve.h
@@ -53,7 +53,7 @@ public:
     slave_requests.push_back(reqid);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(subtrees, payload);
     ::encode(ambiguous_imports, payload);
     ::encode(slave_requests, payload);
diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h
index c3b14c95a2b..4666c59e33f 100644
--- a/src/messages/MMDSResolveAck.h
+++ b/src/messages/MMDSResolveAck.h
@@ -45,7 +45,7 @@ public:
     abort.push_back(r);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(commit, payload);
     ::encode(abort, payload);
   }
diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h
index 7e1ce4fac56..17a157abd7f 100644
--- a/src/messages/MMDSSlaveRequest.h
+++ b/src/messages/MMDSSlaveRequest.h
@@ -127,7 +127,7 @@ private:
   ~MMDSSlaveRequest() {}
 
 public:
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(reqid, payload);
     ::encode(attempt, payload);
     ::encode(op, payload);
diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h
index b9dcaf5668c..a056114f1bd 100644
--- a/src/messages/MMDSTableRequest.h
+++ b/src/messages/MMDSTableRequest.h
@@ -54,7 +54,7 @@ public:
     ::decode(bl, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(table, payload);
     ::encode(op, payload);
     ::encode(reqid, payload);
diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h
index 8dcc9afdcf0..69771250a85 100644
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -44,7 +44,7 @@ public:
     o << " v " << version << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(cmd, payload);
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 92bf9361bb6..4b0f90bb017 100644
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -36,7 +36,7 @@ public:
     o << "mon_command_ack(" << cmd << "=" << r << " " << rs << " v" << version << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(r, payload);
     ::encode(rs, payload);
diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index 95b6f8e58b4..ce1b567763b 100644
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -56,7 +56,7 @@ public:
     out << "election(" << fsid << " " << get_opname(op) << " " << epoch << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(fsid, payload);
     ::encode(op, payload);
diff --git a/src/messages/MMonGetMap.h b/src/messages/MMonGetMap.h
index e145763bd7b..312291b64dc 100644
--- a/src/messages/MMonGetMap.h
+++ b/src/messages/MMonGetMap.h
@@ -28,7 +28,7 @@ private:
 public:
   const char *get_type_name() { return "mon_getmap"; }
   
-  void encode_payload(CephContext *cct) { }
+  void encode_payload(CephContext *cct, uint64_t features) { }
   void decode_payload(CephContext *cct) { }
 };
 
diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h
index c5e347b4bd3..da3665d21a5 100644
--- a/src/messages/MMonGetVersion.h
+++ b/src/messages/MMonGetVersion.h
@@ -37,7 +37,7 @@ public:
     o << "mon_get_version(what=" << what << " handle=" << handle << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(handle, payload);
     ::encode(what, payload);
   }
diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h
index 5c666a5020b..7346602ec0e 100644
--- a/src/messages/MMonGetVersionReply.h
+++ b/src/messages/MMonGetVersionReply.h
@@ -36,7 +36,7 @@ public:
     o << "mon_check_map_ack(handle=" << handle << " version=" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(handle, payload);
     ::encode(version, payload);
diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h
index 2d966f1661b..8abe9c04c8d 100644
--- a/src/messages/MMonGlobalID.h
+++ b/src/messages/MMonGlobalID.h
@@ -34,7 +34,7 @@ public:
     paxos_decode(p);
     ::decode(old_max_id, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(old_max_id, payload);
   }
diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h
index 54afc232138..23b468bb710 100644
--- a/src/messages/MMonJoin.h
+++ b/src/messages/MMonJoin.h
@@ -41,7 +41,7 @@ public:
     o << "mon_join(" << name << " " << addr << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(name, payload);
diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h
index 26f04e0a5cc..c7dc06dcd81 100644
--- a/src/messages/MMonMap.h
+++ b/src/messages/MMonMap.h
@@ -31,7 +31,7 @@ private:
 public:
   const char *get_type_name() { return "mon_map"; }
 
-  void encode_payload(CephContext *cct) { 
+  void encode_payload(CephContext *cct, uint64_t features) { 
     ::encode(monmapbl, payload);
   }
   void decode_payload(CephContext *cct) { 
diff --git a/src/messages/MMonObserve.h b/src/messages/MMonObserve.h
index 84b08dd80b5..dde35d2e754 100644
--- a/src/messages/MMonObserve.h
+++ b/src/messages/MMonObserve.h
@@ -39,7 +39,7 @@ public:
     o << "observe(" << machine_id << " v" << ver << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(machine_id, payload);
diff --git a/src/messages/MMonObserveNotify.h b/src/messages/MMonObserveNotify.h
index 94c25c46667..b6842d1491d 100644
--- a/src/messages/MMonObserveNotify.h
+++ b/src/messages/MMonObserveNotify.h
@@ -40,7 +40,7 @@ public:
     o << " v" << version << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(machine_id, payload);
diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index 8204ffc7735..475abe6ea69 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -87,7 +87,7 @@ public:
     out <<  ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     if (connection->has_feature(CEPH_FEATURE_MONCLOCKCHECK))
       header.version = 1;
     ::encode(epoch, payload);
diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index 8286f620435..592cd0d3db5 100644
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -72,7 +72,7 @@ public:
     out << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(op, payload);
     ::encode(name, payload);
diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h
index 6b6b751cb5c..46557d3a7dc 100644
--- a/src/messages/MMonSubscribe.h
+++ b/src/messages/MMonSubscribe.h
@@ -68,7 +68,7 @@ public:
       ::decode(what, p);
     }
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     if (get_connection()->has_feature(CEPH_FEATURE_SUBSCRIBE2)) {
       header.version = 2;
       ::encode(what, payload);
diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h
index d958038ab13..24361150a86 100644
--- a/src/messages/MMonSubscribeAck.h
+++ b/src/messages/MMonSubscribeAck.h
@@ -41,7 +41,7 @@ public:
     ::decode(interval, p);
     ::decode(fsid, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(interval, payload);
     ::encode(fsid, payload);
   }
diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h
index 4fb8d039fba..b44286f3aa1 100644
--- a/src/messages/MOSDAlive.h
+++ b/src/messages/MOSDAlive.h
@@ -29,7 +29,7 @@ private:
   ~MOSDAlive() {}
 
 public:
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(want, payload);
   }
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index 60f34327c83..f3bc0444004 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -41,7 +41,7 @@ public:
     out << "osd_boot(osd." << sb.whoami << " v" << version << ")";
   }
   
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(sb, payload);
diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h
index e3c2661945c..8f8685e3358 100644
--- a/src/messages/MOSDFailure.h
+++ b/src/messages/MOSDFailure.h
@@ -48,7 +48,7 @@ public:
       ::decode(is_failed, p);
     else is_failed = true;
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(fsid, payload);
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index e2a6581bc5c..500f24c72df 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -79,7 +79,7 @@ public:
       newest_map = 0;
     }
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     header.version = 2;
     if (connection && (!connection->has_feature(CEPH_FEATURE_PGID64) ||
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index b20d8f6cf4d..3c59fb05d8a 100644
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -184,7 +184,7 @@ public:
   }
 
   // marshalling
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
 
     OSDOp::merge_osd_op_vector_in_data(ops, data);
 
diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 20ce7c61100..84e16eb2687 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -108,7 +108,7 @@ private:
   ~MOSDOpReply() {}
 
 public:
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
 
     OSDOp::merge_osd_op_vector_out_data(ops, data);
 
diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h
index adf0d28e63d..e5783cf9a61 100644
--- a/src/messages/MOSDPGBackfill.h
+++ b/src/messages/MOSDPGBackfill.h
@@ -50,7 +50,7 @@ public:
     ::decode(stats, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(op, payload);
     ::encode(map_epoch, payload);
     ::encode(query_epoch, payload);
diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h
index 9b744d9c90c..d93a1421cf7 100644
--- a/src/messages/MOSDPGCreate.h
+++ b/src/messages/MOSDPGCreate.h
@@ -54,7 +54,7 @@ private:
 public:  
   const char *get_type_name() { return "pg_create"; }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(epoch, payload);
     ::encode(mkpg, payload);
   }
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index 9668a8416cf..da176728a32 100644
--- a/src/messages/MOSDPGInfo.h
+++ b/src/messages/MOSDPGInfo.h
@@ -39,7 +39,7 @@ public:
     out << "pg_info(" << pg_info.size() << " pgs e" << epoch << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pg_info, payload);
   }
diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index a67e51dd47d..5ceee001ade 100644
--- a/src/messages/MOSDPGLog.h
+++ b/src/messages/MOSDPGLog.h
@@ -52,7 +52,7 @@ public:
 	<< " query_epoch " << query_epoch << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(epoch, payload);
     ::encode(info, payload);
diff --git a/src/messages/MOSDPGMissing.h b/src/messages/MOSDPGMissing.h
index 4b099997b69..00abe5f6aa1 100644
--- a/src/messages/MOSDPGMissing.h
+++ b/src/messages/MOSDPGMissing.h
@@ -41,7 +41,7 @@ public:
     out << "pg_missing(" << info.pgid << " e" << epoch << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(epoch, payload);
     ::encode(info, payload);
     ::encode(missing, payload);
diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h
index adcb050e6a5..cf53e3b7a76 100644
--- a/src/messages/MOSDPGNotify.h
+++ b/src/messages/MOSDPGNotify.h
@@ -49,7 +49,7 @@ private:
 public:  
   const char *get_type_name() { return "PGnot"; }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h
index a601c7ed748..8c58888a3f9 100644
--- a/src/messages/MOSDPGQuery.h
+++ b/src/messages/MOSDPGQuery.h
@@ -50,7 +50,7 @@ public:
     out << " epoch " << epoch << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
   }
diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h
index dd2a3f30b8c..4dc1ebf0a17 100644
--- a/src/messages/MOSDPGRemove.h
+++ b/src/messages/MOSDPGRemove.h
@@ -39,7 +39,7 @@ private:
 public:  
   const char *get_type_name() { return "PGrm"; }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
   }
diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index cc8df296d9d..d053486efc9 100644
--- a/src/messages/MOSDPGScan.h
+++ b/src/messages/MOSDPGScan.h
@@ -47,7 +47,7 @@ public:
     ::decode(end, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(op, payload);
     ::encode(map_epoch, payload);
     ::encode(query_epoch, payload);
diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h
index 9476662e783..78c88ebd892 100644
--- a/src/messages/MOSDPGTemp.h
+++ b/src/messages/MOSDPGTemp.h
@@ -30,7 +30,7 @@ private:
   ~MOSDPGTemp() {}
 
 public:
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(map_epoch, payload);
     ::encode(pg_temp, payload);
diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h
index 24bebf8f4b9..f404c76261e 100644
--- a/src/messages/MOSDPGTrim.h
+++ b/src/messages/MOSDPGTrim.h
@@ -38,7 +38,7 @@ public:
     out << "pg_trim(" << pgid << " to " << trim_to << " e" << epoch << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pgid, payload);
     ::encode(trim_to, payload);
diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h
index f0feec6e1e1..75541ebe18c 100644
--- a/src/messages/MOSDPing.h
+++ b/src/messages/MOSDPing.h
@@ -61,7 +61,7 @@ public:
     ::decode(op, p);
     ::decode(peer_stat, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(map_epoch, payload);
     ::encode(peer_as_of_epoch, payload);
diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h
index c959c576b00..7599771f480 100644
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -49,7 +49,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(pgid, payload);
     ::encode(scrub_from, payload);
diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h
index e6910f9f3ef..8785a833608 100644
--- a/src/messages/MOSDScrub.h
+++ b/src/messages/MOSDScrub.h
@@ -50,7 +50,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(scrub_pgs, payload);
     ::encode(repair, payload);
diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 31e80d8a5de..da811bedec5 100644
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -108,7 +108,7 @@ public:
       ::decode(oloc, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 3;
 
     ::encode(map_epoch, payload);
diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h
index 2603cdd1392..d01bc6a78bf 100644
--- a/src/messages/MOSDSubOpReply.h
+++ b/src/messages/MOSDSubOpReply.h
@@ -69,7 +69,7 @@ public:
     ::decode(peer_stat, p);
     ::decode(attrset, p);
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(map_epoch, payload);
     ::encode(reqid, payload);
     ::encode(pgid, payload);
diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index e8fda85b8e8..5f94a8423c3 100644
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -39,7 +39,7 @@ public:
     out << "pg_stats(" << pg_stat.size() << " pgs tid " << get_tid() << " v " << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(osd_stat, payload);
diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h
index 95eea72c7e2..8d933803c75 100644
--- a/src/messages/MPGStatsAck.h
+++ b/src/messages/MPGStatsAck.h
@@ -32,7 +32,7 @@ public:
     out << "pg_stats_ack(" << pg_stat.size() << " pgs tid " << get_tid() << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(pg_stat, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MPing.h b/src/messages/MPing.h
index d6175dc6191..a3778c0f5b5 100644
--- a/src/messages/MPing.h
+++ b/src/messages/MPing.h
@@ -28,7 +28,7 @@ private:
 
 public:
   void decode_payload(CephContext *cct) { }
-  void encode_payload(CephContext *cct) { }
+  void encode_payload(CephContext *cct, uint64_t features) { }
   const char *get_type_name() { return "ping"; }
 };
 
diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index 589a424543a..ddd6c242ec1 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -54,7 +54,7 @@ public:
 	<< " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 4;
     paxos_encode();
     ::encode(fsid, payload);
diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h
index 82216bf53c9..6f0a3a49b47 100644
--- a/src/messages/MPoolOpReply.h
+++ b/src/messages/MPoolOpReply.h
@@ -52,7 +52,7 @@ public:
 	<< " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(replyCode, payload);
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index c2f47087ea5..adba7e835e1 100644
--- a/src/messages/MRemoveSnaps.h
+++ b/src/messages/MRemoveSnaps.h
@@ -35,7 +35,7 @@ public:
     out << "remove_snaps(" << snaps << " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(snaps, payload);
   }
diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index cec976f1708..350bb4cad28 100644
--- a/src/messages/MRoute.h
+++ b/src/messages/MRoute.h
@@ -45,10 +45,10 @@ public:
     ::decode(dest, p);
     msg = decode_message(cct, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(session_mon_tid, payload);
     ::encode(dest, payload);
-    encode_message(cct, msg, payload);
+    encode_message(cct, msg, features, payload);
   }
 
   const char *get_type_name() { return "route"; }
diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index 30d299fd841..1a57bbb4bd8 100644
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -38,7 +38,7 @@ public:
     out << "statfs(" << get_tid() << " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
   }
diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h
index dc94892d28d..f8ea2637d41 100644
--- a/src/messages/MStatfsReply.h
+++ b/src/messages/MStatfsReply.h
@@ -32,7 +32,7 @@ public:
     out << "statfs_reply(" << header.tid << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(h, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h
index 9c62ff91992..54ccb21c600 100644
--- a/src/messages/MWatchNotify.h
+++ b/src/messages/MWatchNotify.h
@@ -45,7 +45,7 @@ public:
     if (msg_ver >= 1)
       ::decode(bl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     uint8_t msg_ver = 1;
     ::encode(msg_ver, payload);
     ::encode(opcode, payload);
diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h
index d5996ebcd59..5551df472cd 100644
--- a/src/messages/PaxosServiceMessage.h
+++ b/src/messages/PaxosServiceMessage.h
@@ -30,7 +30,7 @@ class PaxosServiceMessage : public Message {
     ::decode(session_mon_tid, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     assert(0);
     paxos_encode();
   }