From bb797d0cb141c4f776ef809a160d9e5743638733 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 2 Dec 2019 18:53:44 -0800 Subject: [PATCH] rgw: flatten binary encoding for rgw_sync_pipe_params Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_sync_policy.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_sync_policy.h b/src/rgw/rgw_sync_policy.h index 7b4d1059698..e03b884af30 100644 --- 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); } -- 2.39.5