msg: no cct for decode_payload

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 f76ee49fdea..d7922ebe35d 100644
--- a/src/messages/MAuth.h
+++ b/src/messages/MAuth.h
@@ -35,7 +35,7 @@ public:
 	<< " epoch " << monmap_epoch << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(protocol, p);
diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h
index eaa1524abc8..31c1f993a35 100644
--- a/src/messages/MAuthReply.h
+++ b/src/messages/MAuthReply.h
@@ -45,7 +45,7 @@ public:
     o << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(protocol, p);
     ::decode(result, p);
diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index 42fade885f3..db6eda4559e 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -69,7 +69,7 @@ public:
     realms[df] = r;
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(from, p);
     ::decode(realms, p);
diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
index 2015c66b351..1843b1849a4 100644
--- a/src/messages/MClientCapRelease.h
+++ b/src/messages/MClientCapRelease.h
@@ -36,7 +36,7 @@ public:
     out << "client_cap_release(" << head.num << ")";
   }
   
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode_nohead(head.num, caps, p);
diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index d261692ae63..3aecfe2b235 100644
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -134,7 +134,7 @@ public:
     out << ")";
   }
   
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode_nohead(head.snap_trace_len, snapbl, p);
diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
index bab99a1ea24..0470ad9f67a 100644
--- a/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@ -68,7 +68,7 @@ public:
     out << ")";
   }
   
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(h, p);
     ::decode(dname, p);
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index 43bb11bf924..175aff0b1b1 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -63,7 +63,7 @@ public:
     }
     ::encode_nohead(realms, data);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = data.begin();
     if (header.version >= 2) {
       // new protocol
diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 65768566734..05d96cb3675 100644
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -230,7 +230,7 @@ public:
   }
 
   // serialization
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode(trace_bl, p);
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index a26a7a9b437..2e27382a739 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -141,7 +141,7 @@ public:
 
   int get_dentry_wanted() { return get_flags() & CEPH_MDS_FLAG_WANT_DENTRY; }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode(path, p);
diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h
index 43b0e4094e0..814534cc6da 100644
--- a/src/messages/MClientRequestForward.h
+++ b/src/messages/MClientRequestForward.h
@@ -52,7 +52,7 @@ public:
     ::encode(client_must_resend, payload);
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dest_mds, p);
     ::decode(num_fwd, p);
diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
index d045bda5d41..cd516495c67 100644
--- a/src/messages/MClientSession.h
+++ b/src/messages/MClientSession.h
@@ -55,7 +55,7 @@ public:
     out << ")";
   }
 
-  void decode_payload(CephContext *cct) { 
+  void decode_payload() { 
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
   }
diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
index 56476c6aabf..d7d0383d6a9 100644
--- a/src/messages/MClientSnap.h
+++ b/src/messages/MClientSnap.h
@@ -52,7 +52,7 @@ public:
     ::encode_nohead(split_realms, payload);
     ::encode_nohead(bl, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode_nohead(head.num_split_inos, split_inos, p);
diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h
index 9376aceb580..4d2af0473b5 100644
--- a/src/messages/MCommand.h
+++ b/src/messages/MCommand.h
@@ -49,7 +49,7 @@ public:
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(cmd, p);
diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
index 797c64ea610..701d854daaa 100644
--- a/src/messages/MCommandReply.h
+++ b/src/messages/MCommandReply.h
@@ -45,7 +45,7 @@ public:
     ::encode(r, payload);
     ::encode(rs, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(r, p);
     ::decode(rs, p);
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index 8a91d28ec5c..2b89a4e60d3 100644
--- a/src/messages/MDentryLink.h
+++ b/src/messages/MDentryLink.h
@@ -44,7 +44,7 @@ public:
     o << "dentry_link(" << dirfrag << " " << dn << ")";
   }
   
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(dn, p);
diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
index 30cf4327a80..ca0ce354284 100644
--- a/src/messages/MDentryUnlink.h
+++ b/src/messages/MDentryUnlink.h
@@ -41,7 +41,7 @@ public:
     o << "dentry_unlink(" << dirfrag << " " << dn << ")";
   }
   
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(dn, p);
diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
index de00652b577..cbe1031e0a6 100644
--- a/src/messages/MDirUpdate.h
+++ b/src/messages/MDirUpdate.h
@@ -62,7 +62,7 @@ public:
     out << "dir_update(" << get_dirfrag() << ")";
   }
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(from_mds, p);
     ::decode(dirfrag, p);
diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
index 45132b311e0..b993c82eea0 100644
--- a/src/messages/MDiscover.h
+++ b/src/messages/MDiscover.h
@@ -78,7 +78,7 @@ public:
     out << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(base_ino, p);
     ::decode(base_dir_frag, p);
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index ee3a81419bd..4d3c60e5505 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -180,7 +180,7 @@ public:
 
 
   // ...
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(base_ino, p);
     ::decode(base_dir_frag, p);
diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
index 873751d7da8..167af27cbe4 100644
--- a/src/messages/MExportCaps.h
+++ b/src/messages/MExportCaps.h
@@ -41,7 +41,7 @@ public:
     ::encode(cap_bl, payload);
     ::encode(client_map, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(cap_bl, p);
diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
index 8f5ff81ab09..623fb2b7a14 100644
--- a/src/messages/MExportCapsAck.h
+++ b/src/messages/MExportCapsAck.h
@@ -39,7 +39,7 @@ public:
   virtual void encode_payload(uint64_t features) {
     ::encode(ino, payload);
   }
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
   }
diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
index e6113aedd42..c8542985a20 100644
--- a/src/messages/MExportDir.h
+++ b/src/messages/MExportDir.h
@@ -50,7 +50,7 @@ public:
     ::encode(export_data, payload);
     ::encode(client_map, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(bounds, p);
diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
index 908e0fda6d5..13ff47d21e1 100644
--- a/src/messages/MExportDirAck.h
+++ b/src/messages/MExportDirAck.h
@@ -35,7 +35,7 @@ public:
     o << "export_ack(" << dirfrag << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index eba4dd1a20b..e87775436ce 100644
--- a/src/messages/MExportDirCancel.h
+++ b/src/messages/MExportDirCancel.h
@@ -40,7 +40,7 @@ public:
   void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index a06ac01cc15..e8276f97ba0 100644
--- a/src/messages/MExportDirDiscover.h
+++ b/src/messages/MExportDirDiscover.h
@@ -50,7 +50,7 @@ public:
     o << "export_discover(" << dirfrag << " " << path << ")";
   }
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(from, p);
     ::decode(dirfrag, p);
diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
index 58178a860ca..79cd6c74fe0 100644
--- a/src/messages/MExportDirDiscoverAck.h
+++ b/src/messages/MExportDirDiscoverAck.h
@@ -45,7 +45,7 @@ public:
       o << " failure)";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(success, p);
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index 52e738f6e2d..b97902de932 100644
--- a/src/messages/MExportDirFinish.h
+++ b/src/messages/MExportDirFinish.h
@@ -40,7 +40,7 @@ public:
   void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index e5f1263776d..4b141ba1144 100644
--- a/src/messages/MExportDirNotify.h
+++ b/src/messages/MExportDirNotify.h
@@ -66,7 +66,7 @@ public:
     ::encode(new_auth, payload);
     ::encode(bounds, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(base, p);
     ::decode(ack, p);
diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
index d2e4facb0bb..a3d91366ddf 100644
--- a/src/messages/MExportDirNotifyAck.h
+++ b/src/messages/MExportDirNotifyAck.h
@@ -42,7 +42,7 @@ public:
   void encode_payload(uint64_t features) {
     ::encode(dirfrag, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index 8b8690ee563..c45236d20d5 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -63,7 +63,7 @@ public:
     bystanders.insert(who);
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(basedir, p);
diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
index 7b9d97d3aa7..0593fc5aa73 100644
--- a/src/messages/MExportDirPrepAck.h
+++ b/src/messages/MExportDirPrepAck.h
@@ -37,7 +37,7 @@ public:
     o << "export_prep_ack(" << dirfrag << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index 2969b8c2f20..77f71b5086d 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -53,12 +53,12 @@ public:
     encode_message(msg, features, payload);
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(tid, p);
     ::decode(client, p);
     ::decode(client_caps, p);
-    msg = (PaxosServiceMessage *)decode_message(cct, p);
+    msg = (PaxosServiceMessage *)decode_message(NULL, p);
   }
 
   const char *get_type_name() { return "forward"; }
diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
index 9051b33f269..13ce98eb6e4 100644
--- a/src/messages/MGenericMessage.h
+++ b/src/messages/MGenericMessage.h
@@ -32,7 +32,7 @@ class MGenericMessage : public Message {
 
   const char *get_type_name() { return tname; }
 
-  void decode_payload(CephContext *cct) { }
+  void decode_payload() { }
   void encode_payload(uint64_t features) { }
 };
 
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
index 86f2ebf2c0d..c773487a58e 100644
--- a/src/messages/MGetPoolStats.h
+++ b/src/messages/MGetPoolStats.h
@@ -46,7 +46,7 @@ public:
     ::encode(fsid, payload);
     ::encode(pools, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
index 6b075def2ab..2cda83d16d7 100644
--- a/src/messages/MGetPoolStatsReply.h
+++ b/src/messages/MGetPoolStatsReply.h
@@ -44,7 +44,7 @@ public:
     ::encode(fsid, payload);
     ::encode(pool_stats, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index 7ea740de80a..848509fd1c2 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -53,7 +53,7 @@ public:
     ::encode(beat, payload);
     ::encode(import_map, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     utime_t now(ceph_clock_now(NULL));
     ::decode(load, now, p);
diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index afc55cde57b..5399598f6ad 100644
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -43,7 +43,7 @@ public:
     ::encode(ino, payload);
     ::encode(caps, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(caps, p);
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index b6018a52df1..3bda13f8ac5 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -72,7 +72,7 @@ public:
     this->lockdata = lockdata;
   }
   
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(asker, p);
     ::decode(action, p);
diff --git a/src/messages/MLog.h b/src/messages/MLog.h
index c32393380d3..3c4dfc94f85 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -47,7 +47,7 @@ public:
     ::encode(fsid, payload);
     ::encode(entries, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
index d9caf8c70f2..f1ce5246fd3 100644
--- a/src/messages/MLogAck.h
+++ b/src/messages/MLogAck.h
@@ -37,7 +37,7 @@ public:
     ::encode(fsid, payload);
     ::encode(last, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(last, p);
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index 2da0aa220ed..c77a27aaf9a 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -79,7 +79,7 @@ public:
     ::encode(standby_for_name, payload);
     ::encode(compat, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index 200a3a12db4..0052b3e5c63 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -288,7 +288,7 @@ public:
     ::encode(authpinned_dentries, payload);
     ::encode(xlocked_dentries, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(strong_inodes, p);
diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
index 83564ce7d13..3e291de0591 100644
--- a/src/messages/MMDSFindIno.h
+++ b/src/messages/MMDSFindIno.h
@@ -34,7 +34,7 @@ struct MMDSFindIno : public Message {
     ::encode(tid, payload);
     ::encode(ino, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(tid, p);
     ::decode(ino, p);
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index 44f4d585457..64b48cae6c1 100644
--- a/src/messages/MMDSFindInoReply.h
+++ b/src/messages/MMDSFindInoReply.h
@@ -34,7 +34,7 @@ struct MMDSFindInoReply : public Message {
     ::encode(tid, payload);
     ::encode(path, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(tid, p);
     ::decode(path, p);
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index 042ae365ca0..922f0093c80 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -51,7 +51,7 @@ public:
     ::encode(bits, payload);
     ::encode(basebl, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(basefrag, p);
diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h
index ed46ceb3d49..0aeb6b63b5d 100644
--- a/src/messages/MMDSLoadTargets.h
+++ b/src/messages/MMDSLoadTargets.h
@@ -41,7 +41,7 @@ public:
     o << "mds_load_targets(" << global_id << " " << targets << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(global_id, p);
diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index f04b07fa3fa..ae6ed9a34d0 100644
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -73,7 +73,7 @@ public:
   }
 
   // marshalling
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(epoch, p);
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index be034e7970c..9b929ef68f9 100644
--- a/src/messages/MMDSResolve.h
+++ b/src/messages/MMDSResolve.h
@@ -58,7 +58,7 @@ public:
     ::encode(ambiguous_imports, payload);
     ::encode(slave_requests, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(subtrees, p);
     ::decode(ambiguous_imports, p);
diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h
index 78a0b13c5da..9fcee3e0b4f 100644
--- a/src/messages/MMDSResolveAck.h
+++ b/src/messages/MMDSResolveAck.h
@@ -49,7 +49,7 @@ public:
     ::encode(commit, payload);
     ::encode(abort, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(commit, p);
     ::decode(abort, p);
diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h
index 39ae9a09665..628374eed70 100644
--- a/src/messages/MMDSSlaveRequest.h
+++ b/src/messages/MMDSSlaveRequest.h
@@ -143,7 +143,7 @@ public:
     ::encode(srci_replica, payload);
     ::encode(stray, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(reqid, p);
     ::decode(attempt, p);
diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h
index 64d5d11a445..3ce95173fa9 100644
--- a/src/messages/MMDSTableRequest.h
+++ b/src/messages/MMDSTableRequest.h
@@ -46,7 +46,7 @@ public:
     o << ")";
   }
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(table, p);
     ::decode(op, p);
diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h
index 8c3ecc905d8..26629d72067 100644
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -49,7 +49,7 @@ public:
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index c55b89b3004..3f7bcbcf713 100644
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -42,7 +42,7 @@ public:
     ::encode(rs, payload);
     ::encode(cmd, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(r, p);
diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index 6c7063dd0b9..2d1472af59f 100644
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -64,7 +64,7 @@ public:
     ::encode(monmap_bl, payload);
     ::encode(quorum, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     if (header.version >= 2)
       ::decode(fsid, p);
diff --git a/src/messages/MMonGetMap.h b/src/messages/MMonGetMap.h
index a349538f314..65cec30d5bb 100644
--- a/src/messages/MMonGetMap.h
+++ b/src/messages/MMonGetMap.h
@@ -29,7 +29,7 @@ public:
   const char *get_type_name() { return "mon_getmap"; }
   
   void encode_payload(uint64_t features) { }
-  void decode_payload(CephContext *cct) { }
+  void decode_payload() { }
 };
 
 #endif
diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h
index 809bbd3a564..67a0285793b 100644
--- a/src/messages/MMonGetVersion.h
+++ b/src/messages/MMonGetVersion.h
@@ -42,7 +42,7 @@ public:
     ::encode(what, payload);
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(handle, p);
     ::decode(what, p);
diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h
index 248e3172014..d954aea5fba 100644
--- a/src/messages/MMonGetVersionReply.h
+++ b/src/messages/MMonGetVersionReply.h
@@ -43,7 +43,7 @@ public:
     ::encode(oldest_version, payload);
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(handle, p);
     ::decode(version, p);
diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h
index a8fb69b1dd0..d9c0aa27baf 100644
--- a/src/messages/MMonGlobalID.h
+++ b/src/messages/MMonGlobalID.h
@@ -29,7 +29,7 @@ public:
     out << "global_id  (" << old_max_id << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(old_max_id, p);
diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h
index 51f3ce658c7..30328297c84 100644
--- a/src/messages/MMonJoin.h
+++ b/src/messages/MMonJoin.h
@@ -47,7 +47,7 @@ public:
     ::encode(name, payload);
     ::encode(addr, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h
index 56b5582af61..5e2cc229a74 100644
--- a/src/messages/MMonMap.h
+++ b/src/messages/MMonMap.h
@@ -34,7 +34,7 @@ public:
   void encode_payload(uint64_t features) { 
     ::encode(monmapbl, payload);
   }
-  void decode_payload(CephContext *cct) { 
+  void decode_payload() { 
     bufferlist::iterator p = payload.begin();
     ::decode(monmapbl, p);
   }
diff --git a/src/messages/MMonObserve.h b/src/messages/MMonObserve.h
index b631492f671..45049b7c46c 100644
--- a/src/messages/MMonObserve.h
+++ b/src/messages/MMonObserve.h
@@ -45,7 +45,7 @@ public:
     ::encode(machine_id, payload);
     ::encode(ver, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMonObserveNotify.h b/src/messages/MMonObserveNotify.h
index 33eb667afa5..bc1998e5c6f 100644
--- a/src/messages/MMonObserveNotify.h
+++ b/src/messages/MMonObserveNotify.h
@@ -48,7 +48,7 @@ public:
     ::encode(ver, payload);
     ::encode(is_latest, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index 18329782993..c00d778a405 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -105,7 +105,7 @@ public:
     ::encode(latest_value, payload);
     ::encode(values, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(op, p);
diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index da8df6ad025..30ab98987fe 100644
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -86,7 +86,7 @@ public:
     ::encode(latest_value, payload);
     ::encode(latest_version, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(op, p);
diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h
index b773f1de457..647f4041c1d 100644
--- a/src/messages/MMonSubscribe.h
+++ b/src/messages/MMonSubscribe.h
@@ -47,7 +47,7 @@ public:
     o << "mon_subscribe(" << what << ")";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     if (header.version < 2) {
       map<string, ceph_mon_subscribe_item_old> oldwhat;
diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h
index 4a4b8056a99..6fe71772d0a 100644
--- a/src/messages/MMonSubscribeAck.h
+++ b/src/messages/MMonSubscribeAck.h
@@ -36,7 +36,7 @@ public:
     o << "mon_subscribe_ack(" << interval << "s)";
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(interval, p);
     ::decode(fsid, p);
diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h
index cd205668711..937b2274faa 100644
--- a/src/messages/MOSDAlive.h
+++ b/src/messages/MOSDAlive.h
@@ -33,7 +33,7 @@ public:
     paxos_encode();
     ::encode(want, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(want, p);
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index 88d30f6b27b..30643c478c1 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -48,7 +48,7 @@ public:
     ::encode(hb_addr, payload);
     ::encode(cluster_addr, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(sb, p);
diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h
index f270a47e5a3..7a86b809bfc 100644
--- a/src/messages/MOSDFailure.h
+++ b/src/messages/MOSDFailure.h
@@ -38,7 +38,7 @@ public:
   bool if_osd_failed() { return is_failed; }
   epoch_t get_epoch() { return epoch; }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index d3bb8e80c12..5ac17b6451e 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -66,7 +66,7 @@ private:
 
 public:
   // marshalling
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(incremental_maps, p);
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index 3d3cb67f0ab..b08ef5fc5a6 100644
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -268,7 +268,7 @@ struct ceph_osd_request_head {
     }
   }
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
 
     if (header.version < 2) {
diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 0a1dc9aa2bc..17b0270a11f 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -146,7 +146,7 @@ public:
 	::encode(ops[i].rval, payload);
     }
   }
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     if (header.version < 2) {
       ceph_osd_reply_head head;
diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h
index b38147834e2..44afdf149cd 100644
--- a/src/messages/MOSDPGBackfill.h
+++ b/src/messages/MOSDPGBackfill.h
@@ -40,7 +40,7 @@ public:
   hobject_t last_backfill;
   object_stat_collection_t stats;
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(map_epoch, p);
diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h
index 6052f4c1447..3dc6494ac5a 100644
--- a/src/messages/MOSDPGCreate.h
+++ b/src/messages/MOSDPGCreate.h
@@ -58,7 +58,7 @@ public:
     ::encode(epoch, payload);
     ::encode(mkpg, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(mkpg, p);
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index dd5a75ed87f..cd58e02aa1d 100644
--- a/src/messages/MOSDPGInfo.h
+++ b/src/messages/MOSDPGInfo.h
@@ -43,7 +43,7 @@ public:
     ::encode(epoch, payload);
     ::encode(pg_info, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(pg_info, p);
diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index 3bb3d6811fd..9b3cd853965 100644
--- a/src/messages/MOSDPGLog.h
+++ b/src/messages/MOSDPGLog.h
@@ -60,7 +60,7 @@ public:
     ::encode(missing, payload);
     ::encode(query_epoch, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(info, p);
diff --git a/src/messages/MOSDPGMissing.h b/src/messages/MOSDPGMissing.h
index 764e737422d..8173b2d8f41 100644
--- a/src/messages/MOSDPGMissing.h
+++ b/src/messages/MOSDPGMissing.h
@@ -46,7 +46,7 @@ public:
     ::encode(info, payload);
     ::encode(missing, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(info, p);
diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h
index 0524f65d59c..9cc12cb26e2 100644
--- a/src/messages/MOSDPGNotify.h
+++ b/src/messages/MOSDPGNotify.h
@@ -55,7 +55,7 @@ public:
     ::encode(pg_list, payload);
     ::encode(query_epoch, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(pg_list, p);
diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h
index a5a2b528c13..9a46932f5ab 100644
--- a/src/messages/MOSDPGQuery.h
+++ b/src/messages/MOSDPGQuery.h
@@ -54,7 +54,7 @@ public:
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(pg_list, p);
diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h
index b78070c3ca0..333201ceb86 100644
--- a/src/messages/MOSDPGRemove.h
+++ b/src/messages/MOSDPGRemove.h
@@ -43,7 +43,7 @@ public:
     ::encode(epoch, payload);
     ::encode(pg_list, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(pg_list, p);
diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index 6aeeb52e637..4ed1d91c6bf 100644
--- a/src/messages/MOSDPGScan.h
+++ b/src/messages/MOSDPGScan.h
@@ -37,7 +37,7 @@ public:
   pg_t pgid;
   hobject_t begin, end;
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(map_epoch, p);
diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h
index 6432fa64f40..5eb5a557d27 100644
--- a/src/messages/MOSDPGTemp.h
+++ b/src/messages/MOSDPGTemp.h
@@ -35,7 +35,7 @@ public:
     ::encode(map_epoch, payload);
     ::encode(pg_temp, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(map_epoch, p);
diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h
index 0ba0c66e334..702cb5e5310 100644
--- a/src/messages/MOSDPGTrim.h
+++ b/src/messages/MOSDPGTrim.h
@@ -43,7 +43,7 @@ public:
     ::encode(pgid, payload);
     ::encode(trim_to, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(pgid, p);
diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h
index 4635d3df8b3..7bdc8ef65fb 100644
--- a/src/messages/MOSDPing.h
+++ b/src/messages/MOSDPing.h
@@ -53,7 +53,7 @@ private:
   ~MOSDPing() {}
 
 public:
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(map_epoch, p);
diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h
index 52e11fea740..9837f287e18 100644
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -56,7 +56,7 @@ public:
     ::encode(scrub_to, payload);
     ::encode(map_epoch, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     assert(header.version == 2);
     bufferlist::iterator p = payload.begin();
     ::decode(pgid, p);
diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h
index 724ea126247..2f814e7d614 100644
--- a/src/messages/MOSDScrub.h
+++ b/src/messages/MOSDScrub.h
@@ -55,7 +55,7 @@ public:
     ::encode(scrub_pgs, payload);
     ::encode(repair, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(scrub_pgs, p);
diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 30ff3fb0fee..f7596e953e5 100644
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -67,7 +67,7 @@ public:
 
   bool first, complete;
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(map_epoch, p);
     ::decode(reqid, p);
diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h
index b49a20c181d..920fe78ac64 100644
--- a/src/messages/MOSDSubOpReply.h
+++ b/src/messages/MOSDSubOpReply.h
@@ -50,7 +50,7 @@ public:
 
   map<string,bufferptr> attrset;
 
-  virtual void decode_payload(CephContext *cct) {
+  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(map_epoch, p);
     ::decode(reqid, p);
diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index 06f590bdea2..e5af677070b 100644
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -47,7 +47,7 @@ public:
     ::encode(epoch, payload);
     ::encode(had_map_for, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h
index 44e04959bb5..045ad4bfe16 100644
--- a/src/messages/MPGStatsAck.h
+++ b/src/messages/MPGStatsAck.h
@@ -35,7 +35,7 @@ public:
   void encode_payload(uint64_t features) {
     ::encode(pg_stat, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(pg_stat, p);
   }
diff --git a/src/messages/MPing.h b/src/messages/MPing.h
index a0cd5446da3..005f11c786b 100644
--- a/src/messages/MPing.h
+++ b/src/messages/MPing.h
@@ -27,7 +27,7 @@ private:
   ~MPing() {}
 
 public:
-  void decode_payload(CephContext *cct) { }
+  void decode_payload() { }
   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 d81f37dee9b..5ed45944bab 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -67,7 +67,7 @@ public:
     ::encode(pad, payload);  /* for v3->v4 encoding change */
     ::encode(crush_rule, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h
index d3dc2d49bea..b3002289c62 100644
--- a/src/messages/MPoolOpReply.h
+++ b/src/messages/MPoolOpReply.h
@@ -63,7 +63,7 @@ public:
     } else
       ::encode(false, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index 79b3fbc8931..21fffc05cf5 100644
--- a/src/messages/MRemoveSnaps.h
+++ b/src/messages/MRemoveSnaps.h
@@ -39,7 +39,7 @@ public:
     paxos_encode();
     ::encode(snaps, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(snaps, p);
diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index 4f1a05bfa61..050e265ef45 100644
--- a/src/messages/MRoute.h
+++ b/src/messages/MRoute.h
@@ -28,7 +28,7 @@ struct MRoute : public Message {
   MRoute() : Message(MSG_ROUTE), msg(NULL) {}
   MRoute(uint64_t t, Message *m) :
     Message(MSG_ROUTE), session_mon_tid(t), msg(m) {}
-  MRoute(CephContext *cct, bufferlist bl, entity_inst_t i) :
+  MRoute(bufferlist bl, entity_inst_t i) :
     Message(MSG_ROUTE), session_mon_tid(0), dest(i) {
     bufferlist::iterator p = bl.begin();
     msg = decode_message(NULL, p);
@@ -39,7 +39,7 @@ private:
   }
 
 public:
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(session_mon_tid, p);
     ::decode(dest, p);
diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index 35067b9e9e3..dac147f442e 100644
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -42,7 +42,7 @@ public:
     paxos_encode();
     ::encode(fsid, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h
index 8932f154010..bdf52664d23 100644
--- a/src/messages/MStatfsReply.h
+++ b/src/messages/MStatfsReply.h
@@ -35,7 +35,7 @@ public:
   void encode_payload(uint64_t features) {
     ::encode(h, payload);
   }
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(h, p);
   }
diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h
index 2ffffff0164..d39fc99b936 100644
--- a/src/messages/MWatchNotify.h
+++ b/src/messages/MWatchNotify.h
@@ -34,7 +34,7 @@ private:
   ~MWatchNotify() {}
 
 public:
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     uint8_t msg_ver;
     bufferlist::iterator p = payload.begin();
     ::decode(msg_ver, p);
diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h
index dcd5b5a183b..88c908d253f 100644
--- a/src/messages/PaxosServiceMessage.h
+++ b/src/messages/PaxosServiceMessage.h
@@ -35,7 +35,7 @@ class PaxosServiceMessage : public Message {
     paxos_encode();
   }
 
-  void decode_payload(CephContext *cct) {
+  void decode_payload() {
     assert(0);
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);