From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Feb 2010 23:42:43 +0000 (-0800)
Subject: mds: fix (new) sessionmap decoding
X-Git-Tag: v0.20~383
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19ededdfc528c8d78011bda352dcfa6cf9d8321d;p=ceph.git

mds: fix (new) sessionmap decoding

der!
---

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index d3da3cee6ca3..3bc79ed581bd 100644
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -171,11 +171,13 @@ void SessionMap::decode(bufferlist::iterator& p)
   utime_t now = g_clock.now();
   __u64 pre;
   ::decode(pre, p);
-  if (version == (__u64)-1) {
+  if (pre == (__u64)-1) {
     __u8 struct_v;
     ::decode(struct_v, p);
     assert(struct_v == 2);
 
+    ::decode(version, p);
+
     while (!p.end()) {
       entity_inst_t inst;
       ::decode(inst.name, p);