msg: no cct needed for message encoding

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 7fc0e59036c..f76ee49fdea 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, uint64_t features) {
+  void encode_payload(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 7a219a3cb23..eaa1524abc8 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, uint64_t features) {
+  void encode_payload(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 e562a83069a..42fade885f3 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -75,7 +75,7 @@ public:
     ::decode(realms, p);
   }
     
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(from, payload);
     ::encode(realms, payload);
   }
diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
index a25b4afb5bc..2015c66b351 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, uint64_t features) {
+  void encode_payload(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 ac3df11e047..d261692ae63 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, uint64_t features) {
+  void encode_payload(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 e87d7c58205..bab99a1ea24 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, uint64_t features) {
+  virtual void encode_payload(uint64_t features) {
     ::encode(h, payload);
     ::encode(dname, payload);
   }
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index 9327227d5fc..43bb11bf924 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -49,7 +49,7 @@ public:
     realms.push_back(r);
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     if (features & CEPH_FEATURE_FLOCK) {
       // new protocol
       header.version = 2;
diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 88c7b5ababd..65768566734 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, uint64_t features) {
+  virtual void encode_payload(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 360c05051a1..a26a7a9b437 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, uint64_t features) {
+  void encode_payload(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 62fca8df75b..43b0e4094e0 100644
--- a/src/messages/MClientRequestForward.h
+++ b/src/messages/MClientRequestForward.h
@@ -46,7 +46,7 @@ public:
       << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 54411fe6ce6..d045bda5d41 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, uint64_t features) { 
+  void encode_payload(uint64_t features) { 
     ::encode(head, payload);
   }
 };
diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
index 7f662005308..56476c6aabf 100644
--- a/src/messages/MClientSnap.h
+++ b/src/messages/MClientSnap.h
@@ -43,7 +43,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 bcdb938eb4a..9376aceb580 100644
--- a/src/messages/MCommand.h
+++ b/src/messages/MCommand.h
@@ -45,7 +45,7 @@ public:
     o << ")";
   }
   
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }
diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
index 5196487f870..797c64ea610 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(r, payload);
     ::encode(rs, payload);
   }
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index d6286bb0793..8a91d28ec5c 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, uint64_t features) {
+  void encode_payload(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 4d047706719..30cf4327a80 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, uint64_t features) {
+  void encode_payload(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 f26acd7a9d1..de00652b577 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, uint64_t features) {
+  virtual void encode_payload(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 0ee60a21616..45132b311e0 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, uint64_t features) {
+  void encode_payload(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 96ac6752ed2..ee3a81419bd 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, uint64_t features) {
+  void encode_payload(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 ac8cc93f8b9..873751d7da8 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, uint64_t features) {
+  void encode_payload(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 8ffdea660e2..8f5ff81ab09 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, uint64_t features) {
+  virtual void encode_payload(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 a44ae6c507b..e6113aedd42 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, uint64_t features) {
+  void encode_payload(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 e95def9d6d1..908e0fda6d5 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
 
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index 045b78a988d..eba4dd1a20b 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index 4c1e59b7e10..a06ac01cc15 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, uint64_t features) {
+  virtual void encode_payload(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 6fca62ab5aa..58178a860ca 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(success, payload);
   }
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index b6651f41643..52e738f6e2d 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index ea92a234496..e5f1263776d 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, uint64_t features) {
+  void encode_payload(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 ed7989aaa70..d2e4facb0bb 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index df46b802630..8b8690ee563 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -72,7 +72,7 @@ public:
     ::decode(bystanders, p);
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 1b3de01d80e..7b9d97d3aa7 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
 };
diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index b916f5bd893..2969b8c2f20 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -46,11 +46,11 @@ private:
   }
 
 public:
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(tid, payload);
     ::encode(client, payload);
     ::encode(client_caps, payload);
-    encode_message(cct, msg, features, payload);
+    encode_message(msg, features, payload);
   }
 
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
index edeb8ae755e..9051b33f269 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, uint64_t features) { }
+  void encode_payload(uint64_t features) { }
 };
 
 #endif
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
index 4905e6feb1e..86f2ebf2c0d 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pools, payload);
diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
index e5832bd7334..6b075def2ab 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, uint64_t features) {
+  void encode_payload(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 e3bdf122044..7197c78525d 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, uint64_t features) {
+  void encode_payload(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 58cf3837264..afc55cde57b 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(ino, payload);
     ::encode(caps, payload);
   }
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index 053efe8b281..b6018a52df1 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, uint64_t features) {
+  virtual void encode_payload(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 0b3206f8829..c32393380d3 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -42,7 +42,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(entries, payload);
diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
index f3137499948..d9caf8c70f2 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(fsid, payload);
     ::encode(last, payload);
   }
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index ca19828b7a9..2da0aa220ed 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(fsid, payload);
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index e8e09cb9cd7..200a3a12db4 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -271,7 +271,7 @@ public:
   }
 
   // -- encoding --
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 2379efe8630..83564ce7d13 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(tid, payload);
     ::encode(ino, payload);
   }
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index 91babc23d15..44f4d585457 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(tid, payload);
     ::encode(path, payload);
   }
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index fa90c84adb0..042ae365ca0 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -45,7 +45,7 @@ public:
       << " " << (int)bits << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 225f7330a56..ed46ceb3d49 100644
--- a/src/messages/MMDSLoadTargets.h
+++ b/src/messages/MMDSLoadTargets.h
@@ -48,7 +48,7 @@ public:
     ::decode(targets, p);
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 3e19cb41312..f04b07fa3fa 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(fsid, payload);
     ::encode(epoch, payload);
     if ((features & CEPH_FEATURE_PGID64) == 0) {
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index 2436b696d18..be034e7970c 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, uint64_t features) {
+  void encode_payload(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 4666c59e33f..78a0b13c5da 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(commit, payload);
     ::encode(abort, payload);
   }
diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h
index 17a157abd7f..39ae9a09665 100644
--- a/src/messages/MMDSSlaveRequest.h
+++ b/src/messages/MMDSSlaveRequest.h
@@ -127,7 +127,7 @@ private:
   ~MMDSSlaveRequest() {}
 
 public:
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 a056114f1bd..64d5d11a445 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, uint64_t features) {
+  virtual void encode_payload(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 69771250a85..8c3ecc905d8 100644
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -44,7 +44,7 @@ public:
     o << " v " << version << ")";
   }
   
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(cmd, payload);
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 4b0f90bb017..c55b89b3004 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(r, payload);
     ::encode(rs, payload);
diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index ce1b567763b..6c7063dd0b9 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, uint64_t features) {
+  void encode_payload(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 312291b64dc..a349538f314 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, uint64_t features) { }
+  void encode_payload(uint64_t features) { }
   void decode_payload(CephContext *cct) { }
 };
 
diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h
index da3665d21a5..809bbd3a564 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(handle, payload);
     ::encode(what, payload);
   }
diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h
index 7346602ec0e..248e3172014 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, uint64_t features) {
+  void encode_payload(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 8abe9c04c8d..a8fb69b1dd0 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(old_max_id, payload);
   }
diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h
index 23b468bb710..51f3ce658c7 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(name, payload);
diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h
index c7dc06dcd81..56b5582af61 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, uint64_t features) { 
+  void encode_payload(uint64_t features) { 
     ::encode(monmapbl, payload);
   }
   void decode_payload(CephContext *cct) { 
diff --git a/src/messages/MMonObserve.h b/src/messages/MMonObserve.h
index dde35d2e754..b631492f671 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, uint64_t features) {
+  void encode_payload(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 b6842d1491d..33eb667afa5 100644
--- a/src/messages/MMonObserveNotify.h
+++ b/src/messages/MMonObserveNotify.h
@@ -40,7 +40,7 @@ public:
     o << " v" << version << ")";
   }
   
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 1e165d57358..5bc87f335f4 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -87,7 +87,7 @@ public:
     out <<  ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     if (features & CEPH_FEATURE_MONCLOCKCHECK)
       header.version = 1;
     ::encode(epoch, payload);
diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index 592cd0d3db5..da8df6ad025 100644
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -72,7 +72,7 @@ public:
     out << ")";
   }
   
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 1a4bb9f5631..b773f1de457 100644
--- a/src/messages/MMonSubscribe.h
+++ b/src/messages/MMonSubscribe.h
@@ -68,7 +68,7 @@ public:
       ::decode(what, p);
     }
   }
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     if (features & CEPH_FEATURE_SUBSCRIBE2) {
       header.version = 2;
       ::encode(what, payload);
diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h
index 24361150a86..4a4b8056a99 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(interval, payload);
     ::encode(fsid, payload);
   }
diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h
index b44286f3aa1..cd205668711 100644
--- a/src/messages/MOSDAlive.h
+++ b/src/messages/MOSDAlive.h
@@ -29,7 +29,7 @@ private:
   ~MOSDAlive() {}
 
 public:
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(want, payload);
   }
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index f3bc0444004..88d30f6b27b 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(sb, payload);
diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h
index 8f8685e3358..f270a47e5a3 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(fsid, payload);
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 3b450e4c4f5..d3bb8e80c12 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -79,7 +79,7 @@ public:
       newest_map = 0;
     }
   }
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(fsid, payload);
     header.version = 2;
     if ((features & CEPH_FEATURE_PGID64) == 0 ||
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index d6864405cc9..3d3cb67f0ab 100644
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -184,7 +184,7 @@ public:
   }
 
   // marshalling
-  virtual void encode_payload(CephContext *cct, uint64_t features) {
+  virtual void encode_payload(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 88cec1149f9..0a1dc9aa2bc 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -108,7 +108,7 @@ private:
   ~MOSDOpReply() {}
 
 public:
-  virtual void encode_payload(CephContext *cct, uint64_t features) {
+  virtual void encode_payload(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 e5783cf9a61..b38147834e2 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, uint64_t features) {
+  virtual void encode_payload(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 d93a1421cf7..6052f4c1447 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(epoch, payload);
     ::encode(mkpg, payload);
   }
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index da176728a32..dd5a75ed87f 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pg_info, payload);
   }
diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index 5ceee001ade..3bb3d6811fd 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, uint64_t features) {
+  void encode_payload(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 00abe5f6aa1..764e737422d 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, uint64_t features) {
+  void encode_payload(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 cf53e3b7a76..0524f65d59c 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, uint64_t features) {
+  void encode_payload(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 8c58888a3f9..a5a2b528c13 100644
--- a/src/messages/MOSDPGQuery.h
+++ b/src/messages/MOSDPGQuery.h
@@ -50,7 +50,7 @@ public:
     out << " epoch " << epoch << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
   }
diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h
index 4dc1ebf0a17..b78070c3ca0 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
   }
diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index d053486efc9..6aeeb52e637 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, uint64_t features) {
+  virtual void encode_payload(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 78c88ebd892..6432fa64f40 100644
--- a/src/messages/MOSDPGTemp.h
+++ b/src/messages/MOSDPGTemp.h
@@ -30,7 +30,7 @@ private:
   ~MOSDPGTemp() {}
 
 public:
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 f404c76261e..0ba0c66e334 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, uint64_t features) {
+  void encode_payload(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 75541ebe18c..4635d3df8b3 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, uint64_t features) {
+  void encode_payload(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 7599771f480..52e11fea740 100644
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -49,7 +49,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 8785a833608..724ea126247 100644
--- a/src/messages/MOSDScrub.h
+++ b/src/messages/MOSDScrub.h
@@ -50,7 +50,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(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 da811bedec5..30ff3fb0fee 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, uint64_t features) {
+  virtual void encode_payload(uint64_t features) {
     header.version = 3;
 
     ::encode(map_epoch, payload);
diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h
index d01bc6a78bf..b49a20c181d 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, uint64_t features) {
+  virtual void encode_payload(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 5f94a8423c3..06f590bdea2 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, uint64_t features) {
+  void encode_payload(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 8d933803c75..44e04959bb5 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, uint64_t features) {
+  void encode_payload(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 a3778c0f5b5..a0cd5446da3 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, uint64_t features) { }
+  void encode_payload(uint64_t features) { }
   const char *get_type_name() { return "ping"; }
 };
 
diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index ddd6c242ec1..d81f37dee9b 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -54,7 +54,7 @@ public:
 	<< " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     header.version = 4;
     paxos_encode();
     ::encode(fsid, payload);
diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h
index 6f0a3a49b47..d3dc2d49bea 100644
--- a/src/messages/MPoolOpReply.h
+++ b/src/messages/MPoolOpReply.h
@@ -52,7 +52,7 @@ public:
 	<< " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(replyCode, payload);
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index adba7e835e1..79b3fbc8931 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(snaps, payload);
   }
diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index 350bb4cad28..d9bc7f83397 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(session_mon_tid, payload);
     ::encode(dest, payload);
-    encode_message(cct, msg, features, payload);
+    encode_message(msg, features, payload);
   }
 
   const char *get_type_name() { return "route"; }
diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index 1a57bbb4bd8..35067b9e9e3 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
   }
diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h
index f8ea2637d41..8932f154010 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     ::encode(h, payload);
   }
   void decode_payload(CephContext *cct) {
diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h
index 54ccb21c600..2ffffff0164 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, uint64_t features) {
+  void encode_payload(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 5551df472cd..dcd5b5a183b 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, uint64_t features) {
+  void encode_payload(uint64_t features) {
     assert(0);
     paxos_encode();
   }