From cb15eb88266de948e3a1c91c9b9af6f1170c2e5a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 9 Feb 2012 21:56:18 -0800
Subject: [PATCH] os: new encoding for hobject_t
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---
src/os/hobject.cc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/os/hobject.cc b/src/os/hobject.cc
index 113cf76b92f..dabdb0ce6a0 100644
--- a/src/os/hobject.cc
+++ b/src/os/hobject.cc
@@ -5,28 +5,28 @@
void hobject_t::encode(bufferlist& bl) const
{
- __u8 version = 2;
- ::encode(version, bl);
+ ENCODE_START(3, 3, bl);
::encode(key, bl);
::encode(oid, bl);
::encode(snap, bl);
::encode(hash, bl);
::encode(max, bl);
+ ENCODE_FINISH(bl);
}
void hobject_t::decode(bufferlist::iterator& bl)
{
- __u8 version;
- ::decode(version, bl);
- if (version >= 1)
+ DECODE_START_LEGACY_COMPAT_LEN(3, 3, 3, bl);
+ if (struct_v >= 1)
::decode(key, bl);
::decode(oid, bl);
::decode(snap, bl);
::decode(hash, bl);
- if (version >= 2)
+ if (struct_v >= 2)
::decode(max, bl);
else
max = false;
+ DECODE_FINISH(bl);
}
void hobject_t::dump(Formatter *f) const