osdmap: successfully decode short map

When we send (old) maps to the kclient, we omit the extended section.  Lets
decode those (old, abbreviated maps) successfully, too.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index a2d92586834bbb2a4d16fc5a18a36bae6177ccef..e8cc15ac6069632b63e3d4a74d50f52f65b0d77c 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -243,6 +243,10 @@ void OSDMap::Incremental::decode(bufferlist::iterator &p)
     ::decode(new_pg_temp, p);
   }
 
+  // decode short map, too.
+  if (v == 5 && p.end())
+    return;
+
   // extended
   __u16 ev = 0;
   if (v >= 5)