From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 14 Apr 2016 15:15:35 +0000 (-0700)
Subject: FSMap: guard the ever_enabled_multiple decode
X-Git-Tag: ses3-milestone4~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b358c61a8b94ea74b29ad72ec1e20ff94d590b40;p=ceph.git

FSMap: guard the ever_enabled_multiple decode

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index 73e425da1507..2fc9f3fbff8e 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -440,7 +440,9 @@ void FSMap::decode(bufferlist::iterator& p)
     ::decode(mds_roles, p);
     ::decode(standby_daemons, p);
     ::decode(standby_epochs, p);
-    ::decode(ever_enabled_multiple, p);
+    if (struct_v >= 7) {
+      ::decode(ever_enabled_multiple, p);
+    }
   }
 
   DECODE_FINISH(p);