]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
MDiscoverReply: encode/decode wanted_ino.
authorGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 9 Jun 2011 20:25:25 +0000 (13:25 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 9 Jun 2011 22:33:21 +0000 (15:33 -0700)
This wasn't encoded previously so it was always zero on the
receiver's end, which led to nasty hangs. :(

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
src/messages/MDiscoverReply.h

index 00c2e78f236b1c31dde627c830d5eb5f5d2613d2..67433a150cc681f5deed43382d4627e10ef8f78d 100644 (file)
@@ -196,8 +196,11 @@ public:
 
     ::decode(starts_with, p);
     ::decode(trace, p);
+    if (header.version >= 2)
+      ::decode(wanted_ino, p);
   }
   void encode_payload() {
+    header.version = 2;
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);
     ::encode(wanted_base_dir, payload);
@@ -212,6 +215,7 @@ public:
 
     ::encode(starts_with, payload);
     ::encode(trace, payload);
+    ::encode(wanted_ino, payload);
   }
 
 };