mds: adjust MClientSnaps encoding

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 4b6f7f469cb1a5e668053825e4b896a4da0ce27a..fab56442fed323f7ca0aea999994865f35850cbc 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -815,6 +815,7 @@ struct ceph_mds_caps {
        struct ceph_timespec mtime, atime, ctime;
        __le64 time_warp_seq;
        __le64 snap_follows;
+       __le32 snap_trace_len;
 } __attribute__ ((packed));
 
 

diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index 773d04e012799212dbec07eb68f2c14169c8b8b9..082dcd743af372c370a5fa5f900b23835130593f 100644 (file)
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -98,11 +98,12 @@ class MClientCaps : public Message {
   void decode_payload() {
     bufferlist::iterator p = payload.begin();
     ::decode(h, p);
-    ::decode(snapbl, p);
+    ::decode_nohead(h.snap_trace_len, snapbl, p);
   }
   void encode_payload() {
+    h.snap_trace_len = snapbl.length();
     ::encode(h, payload);
-    ::encode(snapbl, payload);
+    ::encode_nohead(snapbl, payload);
   }
 };