emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cache] a lot of format 2 changes

Browse Source
This commit is contained in:
Joe Thornber
2016-09-30 11:21:20 -04:00
parent bce4acf214
commit 05c4b7b400
10 changed files with 98 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
caching/mapping_array.cc
View File

@ -60,8 +60,9 @@ invalid_mapping::visit(damage_visitor &v) const
namespace {
class check_mapping_visitor : public mapping_visitor {
public:
check_mapping_visitor(damage_visitor &visitor)
: visitor_(visitor) {
check_mapping_visitor(damage_visitor &visitor, unsigned metadata_version)
: visitor_(visitor),
allowed_flags_(metadata_version == 1 ? (M_VALID | M_DIRTY) : M_VALID) {
}
virtual void visit(block_address cblock, mapping const &m) {
@ -90,12 +91,13 @@ namespace {
seen_oblocks_.insert(m.oblock_);
}
static bool unknown_flags(mapping const &m) {
return (m.flags_ & ~(M_VALID | M_DIRTY));
bool unknown_flags(mapping const &m) {
return m.flags_ & ~allowed_flags_;
}
damage_visitor &visitor_;
set<block_address> seen_oblocks_;
uint32_t allowed_flags_;
};
class ll_damage_visitor {
@ -123,9 +125,9 @@ caching::walk_mapping_array(mapping_array const &array,
}
void
caching::check_mapping_array(mapping_array const &array, damage_visitor &visitor)
caching::check_mapping_array(mapping_array const &array, damage_visitor &visitor, unsigned metadata_version)
{
check_mapping_visitor mv(visitor);
check_mapping_visitor mv(visitor, metadata_version);
walk_mapping_array(array, mv, visitor);
}