osd_types: add read_error flag to Scrubmap::object

Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2013-03-25 12:43:36 -07:00
parent 562e1716bd
commit dab3dacfb7
2 changed files with 8 additions and 2 deletions

View File

@ -2901,7 +2901,7 @@ void ScrubMap::generate_test_instances(list<ScrubMap*>& 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);
}

View File

@ -1952,10 +1952,12 @@ struct ScrubMap {
set<snapid_t> 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);