From 18c8861b4cb9ee7114375442b4511ab13154178f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 2 Feb 2012 12:42:30 -0800 Subject: [PATCH] osd: new encoding for pg_log_entry_t Signed-off-by: Sage Weil --- src/osd/osd_types.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index c39b3a4399c4d..e4a4f06be4db6 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -1233,8 +1233,7 @@ void pg_query_t::generate_test_instances(list& o) void pg_log_entry_t::encode(bufferlist &bl) const { - __u8 struct_v = 3; - ::encode(struct_v, bl); + ENCODE_START(4, 4, bl); ::encode(op, bl); ::encode(soid, bl); ::encode(version, bl); @@ -1243,12 +1242,12 @@ void pg_log_entry_t::encode(bufferlist &bl) const ::encode(mtime, bl); if (op == CLONE) ::encode(snaps, bl); + ENCODE_FINISH(bl); } void pg_log_entry_t::decode(bufferlist::iterator &bl) { - __u8 struct_v; - ::decode(struct_v, bl); + DECODE_START_LEGACY_COMPAT_LEN(4, 4, 4, bl); ::decode(op, bl); if (struct_v < 2) { sobject_t old_soid; @@ -1267,6 +1266,7 @@ void pg_log_entry_t::decode(bufferlist::iterator &bl) ::decode(mtime, bl); if (op == CLONE) ::decode(snaps, bl); + DECODE_FINISH(bl); } void pg_log_entry_t::dump(Formatter *f) const -- 2.39.5