fixed encoding for remaining non-mds messages

diff --git a/src/include/types.h b/src/include/types.h
index 128fe26da0974ca75dacc4779dd7506b907ece5e..ceb28d7978dc56995359d71830c28f30fb6f076c 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -110,16 +110,18 @@ struct ltstr
 
 #include "encoding.h"
 
-WRITE_RAW_ENCODER(ceph_fsid);
-WRITE_RAW_ENCODER(ceph_file_layout);
-WRITE_RAW_ENCODER(ceph_mds_request_head);
-WRITE_RAW_ENCODER(ceph_mds_file_caps);
-WRITE_RAW_ENCODER(ceph_mds_lease);
-WRITE_RAW_ENCODER(ceph_mds_reply_head);
-WRITE_RAW_ENCODER(ceph_mds_reply_inode);
-
-WRITE_RAW_ENCODER(ceph_osd_request_head);
-WRITE_RAW_ENCODER(ceph_osd_reply_head);
+WRITE_RAW_ENCODER(ceph_fsid)
+WRITE_RAW_ENCODER(ceph_file_layout)
+WRITE_RAW_ENCODER(ceph_mds_request_head)
+WRITE_RAW_ENCODER(ceph_mds_file_caps)
+WRITE_RAW_ENCODER(ceph_mds_lease)
+WRITE_RAW_ENCODER(ceph_mds_reply_head)
+WRITE_RAW_ENCODER(ceph_mds_reply_inode)
+
+WRITE_RAW_ENCODER(ceph_osd_request_head)
+WRITE_RAW_ENCODER(ceph_osd_reply_head)
+
+WRITE_RAW_ENCODER(ceph_statfs)
 
 // ----------------------
 // some basic types

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 577287ffcf1ac48c0e9b0a67822aeba5da17873f..379f02dd3ff64cf57c669a5409b0dc0ac8095b0a 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -589,7 +589,7 @@ void Server::set_trace_dist(Session *session, MClientReply *reply, CInode *in, C
   }
 
  inode:
-  InodeStat::_encode(bl, in);
+  InodeStat::encode(bl, in);
   lmask = mds->locker->issue_client_lease(in, client, bl, now, session);
   numi++;
   dout(20) << " trace added " << lmask << " " << *in << dendl;
@@ -606,7 +606,7 @@ void Server::set_trace_dist(Session *session, MClientReply *reply, CInode *in, C
   dout(20) << " trace added " << lmask << " " << *dn << dendl;
   
   // dir
-  DirStat::_encode(bl, dn->get_dir(), whoami);
+  DirStat::encode(bl, dn->get_dir(), whoami);
   dout(20) << " trace added " << *dn->get_dir() << dendl;
 
   in = dn->get_dir()->get_inode();
@@ -1765,7 +1765,7 @@ void Server::handle_client_readdir(MDRequest *mdr)
 
   // build dir contents
   bufferlist dirbl, dnbl;
-  DirStat::_encode(dirbl, dir, mds->get_nodeid());
+  DirStat::encode(dirbl, dir, mds->get_nodeid());
 
   __u32 numfiles = 0;
   for (CDir::map_t::iterator it = dir->begin(); 
@@ -1805,7 +1805,7 @@ void Server::handle_client_readdir(MDRequest *mdr)
     mds->locker->issue_client_lease(dn, client, dnbl, mdr->now, mdr->session);
 
     // inode
-    InodeStat::_encode(dnbl, in);
+    InodeStat::encode(dnbl, in);
     mds->locker->issue_client_lease(in, client, dnbl, mdr->now, mdr->session);
     numfiles++;
 

diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
index 53d9e35cb080ee12d775538f7faf5325d1b8a9b3..c4e54e52496548453871c0ca627f66aad8b9263a 100644 (file)
--- a/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@ -63,13 +63,13 @@ struct MClientLease : public Message {
   }
   
   void decode_payload() {
-    int off = 0;
-    ::_decode(h, payload, off);
-    ::_decode(dname, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(h, p);
+    ::decode(dname, p);
   }
   virtual void encode_payload() {
-    ::_encode(h, payload);
-    ::_encode(dname, payload);
+    ::encode(h, payload);
+    ::encode(dname, payload);
   }
 
 };

diff --git a/src/messages/MClientMount.h b/src/messages/MClientMount.h
index 8723ca3e178e0033471edbe2588c3562e488b03a..c97757c4977a0ae54636308c1a1b6cd2bae2b29d 100644 (file)
--- a/src/messages/MClientMount.h
+++ b/src/messages/MClientMount.h
@@ -20,26 +20,11 @@
 class MClientMount : public Message {
 public:
   MClientMount() : Message(CEPH_MSG_CLIENT_MOUNT) { }
-  /*MClientMount(entity_addr_t a, int i = 0) : 
-    Message(CEPH_MSG_CLIENT_MOUNT),
-    addr(a), instance(i) { }
-  */
 
   const char *get_type_name() { return "client_mount"; }
 
-  void decode_payload() { 
-    /*
-    int off = 0;
-    ::_decode(addr, payload, off);
-    ::_decode(instance, payload, off);
-    */
-  }
-  void encode_payload() { 
-    /*
-    ::_encode(addr, payload);
-    ::_encode(instance, payload);
-    */
-  }
+  void decode_payload() { }
+  void encode_payload() { }
 };
 
 #endif

diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 4936745a4d167709915b4e22a5e55a79a3d13423..b5b470110a6b5169d94660c49062b9793cd1476e 100644 (file)
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -65,8 +65,6 @@ struct LeaseStat {
 };
 WRITE_CLASS_ENCODERS(LeaseStat)
 
-
-
 struct DirStat {
   // mds distribution hints
   frag_t frag;
@@ -86,7 +84,7 @@ struct DirStat {
     ::decode(dist, p);
   }
 
-  static void _encode(bufferlist& bl, CDir *dir, int whoami) {
+  static void encode(bufferlist& bl, CDir *dir, int whoami) {
     /*
      * note: encoding matches struct ceph_client_reply_dirfrag
      */
@@ -155,7 +153,7 @@ struct InodeStat {
     ::decode(symlink, p);
   }
 
-  static void _encode(bufferlist &bl, CInode *in) {
+  static void encode(bufferlist &bl, CInode *in) {
     /*
      * note: encoding matches struct ceph_client_reply_inode
      */

diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index fe69f316bfd64d15b694ff4e65f21cb6cdb4f748..5c37780aaebe2044917952557ee0def402a29b96 100644 (file)
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -50,21 +50,21 @@ class MMDSBeacon : public Message {
   }
   
   void encode_payload() {
-    ::_encode(fsid, payload);
-    ::_encode(inst, payload);
-    ::_encode(last_epoch_seen, payload);
-    ::_encode(state, payload);
-    ::_encode(seq, payload);
-    ::_encode(want_rank, payload);
+    ::encode(fsid, payload);
+    ::encode(inst, payload);
+    ::encode(last_epoch_seen, payload);
+    ::encode(state, payload);
+    ::encode(seq, payload);
+    ::encode(want_rank, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(fsid, payload, off);
-    ::_decode(inst, payload, off);
-    ::_decode(last_epoch_seen, payload, off);
-    ::_decode(state, payload, off);
-    ::_decode(seq, payload, off);
-    ::_decode(want_rank, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(fsid, p);
+    ::decode(inst, p);
+    ::decode(last_epoch_seen, p);
+    ::decode(state, p);
+    ::decode(seq, p);
+    ::decode(want_rank, p);
   }
 };
 

diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index 0ec0ae4149761ecdb7a263104b6dc881d5a5edf1..bfe4d114c32d0c9baaf274523b1f49a306745891 100644 (file)
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -68,15 +68,15 @@ class MMDSMap : public Message {
 
   // marshalling
   void decode_payload() {
-    int off = 0;
-    ::_decode(fsid, payload, off);
-    ::_decode(epoch, payload, off);
-    ::_decode(encoded, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(fsid, p);
+    ::decode(epoch, p);
+    ::decode(encoded, p);
   }
   void encode_payload() {
-    ::_encode(fsid, payload);
-    ::_encode(epoch, payload);
-    ::_encode(encoded, payload);
+    ::encode(fsid, payload);
+    ::encode(epoch, payload);
+    ::encode(encoded, payload);
   }
 };
 

diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index c508595b0b9871c26e35c69eeb43ac3a14c5c17f..31d721f31b08c80ddfa63aeec73328e1e60a2c76 100644 (file)
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -30,13 +30,13 @@ public:
   }
 
   void encode_payload() {
-    ::_encode(osd_stat, payload);
-    ::_encode(pg_stat, payload);
+    ::encode(osd_stat, payload);
+    ::encode(pg_stat, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(osd_stat, payload, off);
-    ::_decode(pg_stat, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(osd_stat, p);
+    ::decode(pg_stat, p);
   }
 };
 

diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index d65317bd95af9eb9a6bd5c6e3ffd51a29507b5bb..f0d3fc19dc92f7964ff06f91cb601cda64f4710f 100644 (file)
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -31,11 +31,11 @@ public:
   }
 
   void encode_payload() {
-    ::_encode(tid, payload);
+    ::encode(tid, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(tid, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(tid, p);
   }
 };
 

diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h
index 6f87a87224c4f7c4895293a8a56a03176ce5729b..fc43f37b19a313264dd6d54cccbcdfaccdab5d3a 100644 (file)
--- a/src/messages/MStatfsReply.h
+++ b/src/messages/MStatfsReply.h
@@ -30,13 +30,13 @@ public:
   }
 
   void encode_payload() {
-    ::_encode(tid, payload);
-    ::_encode(stfs, payload);
+    ::encode(tid, payload);
+    ::encode(stfs, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(tid, payload, off);
-    ::_decode(stfs, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(tid, p);
+    ::decode(stfs, p);
   }
 };