rgw: flatten binary encoding for rgw_sync_pipe_params

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_sync_policy.h b/src/rgw/rgw_sync_policy.h
index 7b4d10596985ae63ca1ff0f47b5b5c2f57687032..e03b884af3053fbb41a630d9f6bbd004310c4401 100644 (file)
--- a/src/rgw/rgw_sync_policy.h
+++ b/src/rgw/rgw_sync_policy.h
@@ -342,7 +342,7 @@ struct rgw_sync_pipe_params {
   rgw_user user;
 
   void encode(bufferlist& bl) const {
-    ENCODE_START(2, 1, bl);
+    ENCODE_START(1, 1, bl);
     encode(source, bl);
     encode(dest, bl);
     encode(priority, bl);
@@ -359,9 +359,7 @@ struct rgw_sync_pipe_params {
     uint8_t m;
     decode(m, bl);
     mode = (Mode)m;
-    if (struct_v >= 2) {
-      decode(user, bl);
-    }
+    decode(user, bl);
     DECODE_FINISH(bl);
   }