From dab3dacfb7ecbed7a275b8b172c04650af45104b Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 25 Mar 2013 12:43:36 -0700 Subject: [PATCH] osd_types: add read_error flag to Scrubmap::object Signed-off-by: Samuel Just --- src/osd/osd_types.cc | 6 +++++- src/osd/osd_types.h | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 3fd134e31edce..14e60d51288a6 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -2901,7 +2901,7 @@ void ScrubMap::generate_test_instances(list& o) void ScrubMap::object::encode(bufferlist& bl) const { - ENCODE_START(5, 2, bl); + ENCODE_START(6, 2, bl); ::encode(size, bl); ::encode(negative, bl); ::encode(attrs, bl); @@ -2911,6 +2911,7 @@ void ScrubMap::object::encode(bufferlist& bl) const ::encode(snapcolls, bl); ::encode(omap_digest, bl); ::encode(omap_digest_present, bl); + ::encode(read_error, bl); ENCODE_FINISH(bl); } @@ -2936,6 +2937,9 @@ void ScrubMap::object::decode(bufferlist::iterator& bl) ::decode(omap_digest, bl); ::decode(omap_digest_present, bl); } + if (struct_v >= 6) { + ::decode(read_error, bl); + } DECODE_FINISH(bl); } diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index d20e842859cd5..8f32b5d5ae8f8 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1952,10 +1952,12 @@ struct ScrubMap { set snapcolls; __u32 omap_digest; bool omap_digest_present; + bool read_error; object() : size(0), negative(false), digest(0), digest_present(false), - nlinks(0), omap_digest(0), omap_digest_present(false) {} + nlinks(0), omap_digest(0), omap_digest_present(false), + read_error(false) {} void encode(bufferlist& bl) const; void decode(bufferlist::iterator& bl); -- 2.39.5