MOSDRepScrub: use header.version for payload version

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h
index ff8ef98724c34c142eaa1c1ac08e4c92532bf70d..048d0b75e809a666d446b43faf76ca69cd05145c 100644 (file)
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -50,18 +50,15 @@ public:
   }
 
   void encode_payload(CephContext *cct) {
-    __u8 v = 0;
-    ::encode(v, payload);
+    header.version = 2
     ::encode(pgid, payload);
     ::encode(scrub_from, payload);
     ::encode(scrub_to, payload);
     ::encode(map_epoch, payload);
   }
   void decode_payload(CephContext *cct) {
-    __u8 v = -1;
+    assert(header.version == 2);
     bufferlist::iterator p = payload.begin();
-    ::decode(v, p);
-    assert(v == 0);
     ::decode(pgid, p);
     ::decode(scrub_from, p);
     ::decode(scrub_to, p);