mds: include inline data in lock messages

Signed-off-by: Yan, Zheng <[email protected]>
dano · Mar 15, 2014 · 9e21840 · 9e21840
1 parent 5b3422a
commit 9e21840
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -35,7 +35,7 @@
 #include "SessionMap.h"
 
 
-#define CEPH_MDS_PROTOCOL    21 /* cluster internal */
+#define CEPH_MDS_PROTOCOL    22 /* cluster internal */
 
 
 enum {
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ @@
     #include "SessionMap.h"
-    #define CEPH_MDS_PROTOCOL    21 /* cluster internal */
+    #define CEPH_MDS_PROTOCOL    22 /* cluster internal */
     enum {
@@ Expand Down @@