From: John Spray <john.spray@redhat.com>
Date: Thu, 25 Jun 2015 13:08:39 +0000 (+0100)
Subject: mds: include damage_flags in inter-mds encoding
X-Git-Tag: v9.0.3~38^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e07a0da84afba094faf5aa7ca7feabbd52cf5359;p=ceph.git

mds: include damage_flags in inter-mds encoding

...and correspondingly bump the cluster protocol
version as these structures are not versioned
themselves.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 858076a98cfb..6f770a5b2f26 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3351,6 +3351,7 @@ void CInode::_encode_base(bufferlist& bl)
   ::encode(dirfragtree, bl);
   ::encode(xattrs, bl);
   ::encode(old_inodes, bl);
+  ::encode(damage_flags, bl);
   encode_snap(bl);
 }
 void CInode::_decode_base(bufferlist::iterator& p)
@@ -3361,6 +3362,7 @@ void CInode::_decode_base(bufferlist::iterator& p)
   ::decode(dirfragtree, p);
   ::decode(xattrs, p);
   ::decode(old_inodes, p);
+  ::decode(damage_flags, p);
   decode_snap(p);
 }
 
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 8fecfb745030..d364540c8439 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -39,7 +39,7 @@
 #include "Beacon.h"
 
 
-#define CEPH_MDS_PROTOCOL    26 /* cluster internal */
+#define CEPH_MDS_PROTOCOL    27 /* cluster internal */
 
 enum {
   l_mds_first = 2000,