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 7feffa1d0d0a9329b1db254cef80d0fd73c7649e..02cabd371108cdf31b088a9c7f8eac1f7a1a8bf0 100644 (file)
--- 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 4ef3cc9f22665633130147cc13789669aa78694f..ac68fea83f3a3c1ec4c463ed7a5a5850adec50d3 100644 (file)
--- 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 {