From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 10 Apr 2014 02:56:18 +0000 (+0800)
Subject: mds: include truncate_seq/truncate_size in filelock's state
X-Git-Tag: v0.80-rc1~68^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1639%2Fhead;p=ceph.git

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 f8a25d592ade..2f5c842cdb65 100644
--- 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 fc1cfcd9bcb6..a1e1c58c83f9 100644
--- 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 {