msg: no cct for decode_payload

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

diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h
index f76ee49fdead579c40c709a033e35c3c0a059f7c..d7922ebe35db62c43fd9cb36666d36ef751c7672 100644 (file)
--- 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 eaa1524abc80b814b2c82377bdbdd99d47d50640..31c1f993a356b3780adf46457da4a8bb7660d7c9 100644 (file)
--- 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 42fade885f3c2646776715218e89fa2df5982324..db6eda4559e151b80806c80521e0c4ff69ce44c1 100644 (file)
--- 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 2015c66b3515db9950bbcd307b2d901c35d88dc2..1843b1849a40b3fc8086074f23afc84f2ad1c1ca 100644 (file)
--- 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 d261692ae63b69a2d381f812bdef940ab64413c6..3aecfe2b235b2544427f6ec85494cb182184a8ed 100644 (file)
--- 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 bab99a1ea24c7854ccf527c68dbf2c210df6e131..0470ad9f67a596186db9a12579bf5ff655f9ae63 100644 (file)
--- 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 43bb11bf924efc158612cd7a1f338bb73818fe60..175aff0b1b19cefd016482ccc5b0e13b100eba55 100644 (file)
--- 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 657685667345ee10b1b3dff0cc4c5c1fb32e2829..05d96cb367596ce325264a4340589e931fd4280d 100644 (file)
--- 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 a26a7a9b43716d8d6d7d4370fcfbf6351309a133..2e27382a73994bb696697dd18d66995546bf1bb6 100644 (file)
--- 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 43b0e4094e0a12ca1a56ca566264d12f6d07d51e..814534cc6da92dcc4a4212610d558382d8adf032 100644 (file)
--- 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 d045bda5d419be1610bc32dd3a7882d3ae9a4044..cd516495c67317234217a0b3681bb0530fe50107 100644 (file)
--- 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 56476c6aabfe06e3a9a09f350768013484bf4c80..d7d0383d6a9f8e94528b11e55eb6b28e2eb79802 100644 (file)
--- 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 9376aceb580aac8560abd79e8137b3d525bf06d6..4d2af0473b55870d96a4fe86946c5fb414b889f0 100644 (file)
--- 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 797c64ea6106932031a59f2efb4db5fe9425620b..701d854daaa74b13d03d6260e939b781483f97da 100644 (file)
--- 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 8a91d28ec5c3903d3fcc97f78947e0567fc4b47f..2b89a4e60d3ee381da6cb4705b5eda66ac212923 100644 (file)
--- 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 30cf4327a802282a70c5d7c1b869f98a03e34371..ca0ce3542844e6ccf3af56cc4d3e4d76399e1556 100644 (file)
--- 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 de00652b5772452a06dfab68c6b4e19b3144ada4..cbe1031e0a666988eb95dd2a07df1980d8b33a88 100644 (file)
--- 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 45132b311e0de8b06ab7dcf363991977decd547e..b993c82eea09ce16b682e5bc534b4cf8ad8eb0c1 100644 (file)
--- 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 ee3a81419bda41a728cd8b040c9e8890035ba961..4d3c60e5505457758da536b0ba50d9fd99b30262 100644 (file)
--- 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 873751d7da89ea5c705a35b6a066f08a43f13cab..167af27cbe45946ad29faf75bb385af866b366de 100644 (file)
--- 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 8f5ff81ab09afc221626c182fe65e2252f990f54..623fb2b7a145fe8e8c54de8f85e5421c727bc5b1 100644 (file)
--- 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 e6113aedd422a2957aa603675ef715d6a7f36177..c8542985a20598f8dcd524eace461d458d6b13b0 100644 (file)
--- 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 908e0fda6d515c6c5340323f030a4199d0387458..13ff47d21e1fb61ae791d3812114c6745d83cdde 100644 (file)
--- 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 eba4dd1a20b19d2da3b1f5ecd53667943e328154..e87775436cef4058bb77c284c6005401f5742ab9 100644 (file)
--- 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 a06ac01cc1585d046f0372e2735f2532e29cb041..e8276f97ba0dffa8058fc100e2975b9b24eaa0a1 100644 (file)
--- 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 58178a860cad851bb8daaacd807eba2ef264f540..79cd6c74fe02b2a83a3403215d60d3dc3b430191 100644 (file)
--- 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 52e738f6e2dc86aef8edd4dd3f7c36a4639b3e15..b97902de93223c6bd090729d69eacf860b72b3bd 100644 (file)
--- 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 e5f1263776d922f719992b31dfbb23f7a943d15d..4b141ba1144f0bc2a2021641b6537ffa0db9c31f 100644 (file)
--- 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 d2e4facb0bb88b6f2ca7b4b0faee3f90e30993a6..a3d91366ddf7678c97f8a0b5f2c3078067897f84 100644 (file)
--- 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 8b8690ee5631f60ace866d27380786c95451afac..c45236d20d533b8cfb3e3346d58072fea5223473 100644 (file)
--- 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 7b9d97d3aa7628f6f96a71a0d9cefd1bb526c550..0593fc5aa73eba9b43e7407bd809018c30612047 100644 (file)
--- 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 2969b8c2f20535e34aead32e91f2d2f55a8f8665..77f71b5086d9a03e151ee4d7ceed07d0006c5c9f 100644 (file)
--- 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 9051b33f2692a5e8812e8211b71b199abfd2b0aa..13ce98eb6e4d3f849bade8c618674873aed96ee0 100644 (file)
--- 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 86f2ebf2c0d12ecdf2a363689e4fa5509ce5387b..c773487a58eca3a78537a8354b82630ed3092551 100644 (file)
--- 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 6b075def2abb914ace6b6cbd934563759a35f108..2cda83d16d74e5b99f944c100e157f4cf584719c 100644 (file)
--- 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 7ea740de80a0ec03a680e8577e79f85624a1be36..848509fd1c298363cd49a8a31e768f2e9aaa3fc2 100644 (file)
--- 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 afc55cde57b1a90f2a4ec51af6eaecb1d25c616f..5399598f6ad6db7957bfa08facfddc12ef6fa73f 100644 (file)
--- 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 b6018a52df1ba5eba666712231932ec655510787..3bda13f8ac56ef88da8d8379b8d9c77b0e21fa28 100644 (file)
--- 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 c32393380d3b0f7ae87f04a90c5739ee49aea4ab..3c4dfc94f85b681bd2eeca7b233dcf4a171fdc9e 100644 (file)
--- 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 d9caf8c70f2671ae057f2054687fd6ee05b71d10..f1ce5246fd36f726cc21735955552fdfba9b0803 100644 (file)
--- 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 2da0aa220edacdd28049a7799532397e2e0398df..c77a27aaf9af51c266588100508e5dbdadf19a9c 100644 (file)
--- 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 200a3a12db44697e226876867e73e2d5d75beb16..0052b3e5c63cc65b9b8c3eecd99d005e957478eb 100644 (file)
--- 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 83564ce7d13bbb6dec268e36325d75485f448341..3e291de059130d35d6ef5291354e4929c5bfcca1 100644 (file)
--- 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 44f4d585457e6297789d1a837a382dc4ff8d4be3..64b48cae6c1a962a1bffe35a9dd6fb98d71c9867 100644 (file)
--- 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 042ae365ca0002f7a1c33107047a540bb3849dbd..922f0093c80dbb9156f45a662c5f773c8f097891 100644 (file)
--- 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 ed46ceb3d494551157e6dab5972b967e8754c1e7..0aeb6b63b5d34fb625d082fc7cf3cd883845ecf0 100644 (file)
--- 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 f04b07fa3faca81da626496a836edafa45aa2df9..ae6ed9a34d053858aff19631400cdd8ee9c1145a 100644 (file)
--- 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 be034e7970c8d010adc8da1155260293c01f69f1..9b929ef68f98acc4d37f8178e2e69daf13f41143 100644 (file)
--- 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 78a0b13c5da9550cf376819cfe3a9c0acb9bd70e..9fcee3e0b4fa94add6ef257490c861d31293138a 100644 (file)
--- 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 39ae9a09665d6f290fe5018eab327743ed77f118..628374eed702af1bd683794c76370f71db4dc16f 100644 (file)
--- 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 64d5d11a445f7c8e1e9e5c0aec0fac5af82fc062..3ce95173fa9c3aed18049a80a2c750806b423e6c 100644 (file)
--- 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 8c3ecc905d8514ef31bac6355cbae1f1db11a406..26629d72067014c03cffe42c132a1ff20f5be5d5 100644 (file)
--- 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 c55b89b3004cc645338e639ce99e532fcf26f4ff..3f7bcbcf713a6ce284748bd134ee53afcefa5390 100644 (file)
--- 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 6c7063dd0b9054e06f7d716a687dabace9350ee1..2d1472af59fcd47f6dc4a61b23c0504de32705de 100644 (file)
--- 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 a349538f314f444ff483c8540c416ac0285cdd90..65cec30d5bb08f07c3149dfb73a34146c3d6dd45 100644 (file)
--- 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 809bbd3a564506f6743b6f2b2ede28b34d40001f..67a0285793ba10ec536ed3bcb7c1ae18427a8d22 100644 (file)
--- 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 248e3172014e1728e279b93ee841e418117b4da3..d954aea5fbae2ea9a45a6be7f1938b8c42132490 100644 (file)
--- 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 a8fb69b1dd0359cba412d081c2880b6a163e4686..d9c0aa27baf42451cc86b97c5d70068b740d036e 100644 (file)
--- 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 51f3ce658c7467fe36bae31b813c573abeaeb9b3..30328297c84b186ab1ee095df08b47e175ae67a7 100644 (file)
--- 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 56b5582af616cc9e558d0b726e46f496b2758692..5e2cc229a74ee2ab7e73f00516daf0d1d01dc77a 100644 (file)
--- 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 b631492f67163fe5f25dde3662fc57362df78e28..45049b7c46cd1a4a71eb028a96ba9791ef2a6f5d 100644 (file)
--- 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 33eb667afa5a9d139f7ab392f7bb9176d2fa2ec9..bc1998e5c6f4034f8e844556864a1812d9b16072 100644 (file)
--- 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 18329782993186e0a5a711d90a4564a2f5827e02..c00d778a4054f18c87792bc6106861f7e3d798b3 100644 (file)
--- 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 da8df6ad02553bb6e30e728961700dfd581289d4..30ab98987fef0f11a0d4eeeff544b8dbaca9fec6 100644 (file)
--- 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 b773f1de457c118305ac9f8632a167bccc6a4ebb..647f4041c1d3a42e46a3f20788165cdaffb44aa5 100644 (file)
--- 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 4a4b8056a994ad7863d53437050f435039a8fe83..6fe71772d0a1cbda7c7fefa9b9f2672d032594f9 100644 (file)
--- 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 cd20566871191d8530ce3aa886f3e144af752e62..937b2274faa9ec8772eb593626744e0b4c08e285 100644 (file)
--- 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 88d30f6b27b7e38a33172a83b16a1d00ea12860b..30643c478c10c15a4c6c9326137bbf29b6f44b39 100644 (file)
--- 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 f270a47e5a3069a300d05ef86c14604a0976c105..7a86b809bfc53c0ba5d90ceba193439a0b300d21 100644 (file)
--- 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 d3bb8e80c12653f607ce9f8981b6e0ed9167b510..5ac17b6451e90d400576bce0b6d9ada2adcb4324 100644 (file)
--- 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 3d3cb67f0ab382d5766056357389fa594d285b7e..b08ef5fc5a6a92072b97402dd048ec47258963ed 100644 (file)
--- 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 0a1dc9aa2bcba2492a91a745c7c90481c059de4f..17b0270a11f21fab381476e680c2c455dda8bc43 100644 (file)
--- 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 b38147834e2b81d188aa7e562a48658c3c629285..44afdf149cdcfc4a5787f56e8083050e919cefc0 100644 (file)
--- 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 6052f4c1447f235de46dfe0a0c52bca50ca2b0bf..3dc6494ac5ad8bba103d06cf640737211f72df32 100644 (file)
--- 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 dd5a75ed87f519715691b3b93b050792c48d88fc..cd58e02aa1d61ced67b7c0f458eb717da6fb1795 100644 (file)
--- 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 3bb3d6811fdb753102c20f6f6568a161dd7206f3..9b3cd8539655ee6213d00d1d5492d712753256c3 100644 (file)
--- 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 764e737422d57805cae049f62f3c94d220a457ac..8173b2d8f41cece9bc52b2d4059af2d509c3cc45 100644 (file)
--- 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 0524f65d59c665df15ba05a157c0cc3021e198f5..9cc12cb26e269e9f0be32e924d290ad5ede6caf4 100644 (file)
--- 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 a5a2b528c13b6cdfadd4af9b483640e4901834cd..9a46932f5aba39b733f3b9a3b74c70c0e08d0b6f 100644 (file)
--- 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 b78070c3ca095d657d15ae1798530eed5dc4b270..333201ceb86aaafbb983b7d91dfe8ab93cfdb307 100644 (file)
--- 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 6aeeb52e637741277e1f04d9d6cb5ce6f3af0136..4ed1d91c6bf735bc5e4f7aa3f74069110a27abfc 100644 (file)
--- 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 6432fa64f4092c797908b36d184e53f581f77008..5eb5a557d274be63471f92e8b3b4d6f2a5fff705 100644 (file)
--- 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 0ba0c66e33428e9ae5b6a0f9250d40098ac0e23b..702cb5e5310eeb69e13e9ea9fed55de593edfed5 100644 (file)
--- 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 4635d3df8b3063d435f50c87c913a8d1c83d3543..7bdc8ef65fb5db732c7cbe2e4697ea17d5b822be 100644 (file)
--- 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 52e11fea7400af18a058cc15eeff2716276f895a..9837f287e18ba656ab61d33eee997c8415850500 100644 (file)
--- 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 724ea12624715d70297a1e82bcec26ebea93ed72..2f814e7d6149109e69d2be23a25a98cb2555856c 100644 (file)
--- 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 30ff3fb0fee19c4977710788e7847ea5eda71277..f7596e953e5e2402eccede3ba283daabb2050c77 100644 (file)
--- 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 b49a20c181dde32c46b6c6d78159ef8f567e9fc1..920fe78ac6451599b431dd296460d13f34fc7031 100644 (file)
--- 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 06f590bdea22d7e04a96b74db1a827bd59ab02b9..e5af677070bbf76643d370ce320f8c009f474472 100644 (file)
--- 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 44e04959bb5a8a18508d6fc89d198ea4b68722e8..045ad4bfe16c8aabb5180a711f1a6fae87e1ba6f 100644 (file)
--- 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 a0cd5446da374bb71517c911de03255a8c1be07a..005f11c786bfd7c94fb919c6d5e17f3b32e6c490 100644 (file)
--- 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 d81f37dee9b5c8268ae794e7d6a9b23c2e80e936..5ed45944bab940c91c48f9dc64e4e4dd730db49b 100644 (file)
--- 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 d3dc2d49beae12e37894498f8753a6579125b5ae..b3002289c62b33bd0db0fb20c4b6ea2b6d4a6cb9 100644 (file)
--- 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 79b3fbc8931c33e0e948fa10b82dff86f6bc5e50..21fffc05cf5d74945072a71a40bac42babeb1ba9 100644 (file)
--- 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 4f1a05bfa619e6385632d04d771cc4ca65891b21..050e265ef45362939561f04fcce201cda7c81cca 100644 (file)
--- 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 35067b9e9e3e703d4f217a56ec744e0bf05b921f..dac147f442e6161285b537bfebd839d35c90197d 100644 (file)
--- 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 8932f15401033539dfa031170c60996065ab20a8..bdf52664d230131f9ca126798af4346faa3e2a9f 100644 (file)
--- 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 2ffffff01647a0d4f7fe18399c2263498b100ffa..d39fc99b936e339ee38519daf1c2d88837f15bae 100644 (file)
--- 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 dcd5b5a183b493fbb535f18d04b9222c25611fc5..88c908d253f204a19bdf1cafa5e35e9251b0620e 100644 (file)
--- 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);

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index a052dbeef438ce78c6ecac26b7ae46a010b30ec8..2f4af66dfa9eb1dbb87b5a09ef2d3ae3a840e906 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1099,7 +1099,7 @@ void Monitor::try_send_message(Message *m, entity_inst_t to)
 
   for (int i=0; i<(int)monmap->size(); i++) {
     if (i != rank)
-      messenger->send_message(new MRoute(cct, bl, to), monmap->get_inst(i));
+      messenger->send_message(new MRoute(bl, to), monmap->get_inst(i));
   }
 }
 

diff --git a/src/msg/Message.h b/src/msg/Message.h
index ba9ee1622e873481fc7044cb79431acfb81c8f9d..6159b9d4bbfa6f29d9a6fd3969e5660692269d02 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -432,7 +432,7 @@ public:
   }
 
   // virtual bits
-  virtual void decode_payload(CephContext *cct) = 0;
+  virtual void decode_payload() = 0;
   virtual void encode_payload(uint64_t features) = 0;
   virtual const char *get_type_name() = 0;
   virtual void print(ostream& out) {