From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Sat, 15 Mar 2014 12:38:13 +0000 (+0800)
Subject: mds: include inline data in lock messages
X-Git-Tag: v0.78~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1467%2Fhead;p=ceph.git

mds: include inline data in lock messages

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

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 7feffa1d0d0a..02cabd371108 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -1227,6 +1227,8 @@ void CInode::encode_lock_state(int type, bufferlist& bl)
 	::encode(inode.layout, bl);
 	::encode(inode.size, bl);
 	::encode(inode.client_ranges, bl);
+	::encode(inode.inline_data, bl);
+	::encode(inode.inline_version, bl);
       }
     } else {
       bool dirty = filelock.is_dirty();
@@ -1424,6 +1426,8 @@ void CInode::decode_lock_state(int type, bufferlist& bl)
 	::decode(inode.layout, p);
 	::decode(inode.size, p);
 	::decode(inode.client_ranges, p);
+	::decode(inode.inline_data, p);
+	::decode(inode.inline_version, p);
       }
     } else {
       bool replica_dirty;
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 4ef3cc9f2266..ac68fea83f3a 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -35,7 +35,7 @@
 #include "SessionMap.h"
 
 
-#define CEPH_MDS_PROTOCOL    21 /* cluster internal */
+#define CEPH_MDS_PROTOCOL    22 /* cluster internal */
 
 
 enum {