mds: include truncate_seq/truncate_size in filelock's state

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index f8a25d592adea685ea70ae91a2d61c07e8cc3e80..2f5c842cdb658ca7af6bace710f68f2228cd2c02 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -1238,6 +1238,8 @@ void CInode::encode_lock_state(int type, bufferlist& bl)
       if (!is_dir()) {
        ::encode(inode.layout, bl);
        ::encode(inode.size, bl);
+       ::encode(inode.truncate_seq, bl);
+       ::encode(inode.truncate_size, bl);
        ::encode(inode.client_ranges, bl);
        ::encode(inode.inline_data, bl);
        ::encode(inode.inline_version, bl);
@@ -1439,6 +1441,8 @@ void CInode::decode_lock_state(int type, bufferlist& bl)
       if (!is_dir()) {
        ::decode(inode.layout, p);
        ::decode(inode.size, p);
+       ::decode(inode.truncate_seq, p);
+       ::decode(inode.truncate_size, p);
        ::decode(inode.client_ranges, p);
        ::decode(inode.inline_data, p);
        ::decode(inode.inline_version, p);

diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index fc1cfcd9bcb61784f12073c6e7beea3471b88849..a1e1c58c83f996ef3c2e1ff87757b7b9dc880a9b 100644 (file)
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -35,7 +35,7 @@
 #include "SessionMap.h"
 
 
-#define CEPH_MDS_PROTOCOL    22 /* cluster internal */
+#define CEPH_MDS_PROTOCOL    23 /* cluster internal */
 
 
 enum {