From: Sage Weil <sage@newdream.net>
Date: Fri, 8 Aug 2008 00:14:25 +0000 (-0700)
Subject: mds: adjust MClientSnaps encoding
X-Git-Tag: v0.4~292
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bee65fe967dba4d5f67b4cbc9af3bbf9d2c98ac4;p=ceph.git

mds: adjust MClientSnaps encoding
---

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 4b6f7f469cb1..fab56442fed3 100644
--- 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 773d04e01279..082dcd743af3 100644
--- 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);
   }
 };