From 7bad50787c86b3a3fbc26217ba47a438b16d0270 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 17 Jan 2013 18:01:37 -0800 Subject: [PATCH] SnapServer: use modern encoding for server_state Signed-off-by: Greg Farnum --- src/mds/SnapServer.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h index cf8ea6a50b5af..79e58e020dec6 100644 --- a/src/mds/SnapServer.h +++ b/src/mds/SnapServer.h @@ -40,23 +40,22 @@ public: void reset_state(); void encode_server_state(bufferlist& bl) { - __u8 v = 2; - ::encode(v, bl); + ENCODE_START(3, 3, bl); ::encode(last_snap, bl); ::encode(snaps, bl); ::encode(need_to_purge, bl); ::encode(pending_create, bl); ::encode(pending_destroy, bl); ::encode(pending_noop, bl); + ENCODE_FINISH(bl); } void decode_server_state(bufferlist::iterator& bl) { - __u8 v; - ::decode(v, bl); + DECODE_START_LEGACY_COMPAT_LEN(3, 3, 3, bl); ::decode(last_snap, bl); ::decode(snaps, bl); ::decode(need_to_purge, bl); ::decode(pending_create, bl); - if (v >= 2) + if (struct_v >= 2) ::decode(pending_destroy, bl); else { map t; @@ -65,6 +64,7 @@ public: pending_destroy[p->first].first = p->second; } ::decode(pending_noop, bl); + DECODE_FINISH(bl); } // server bits -- 2.39.5