diff --git a/thin-provisioning/mapping_tree.cc b/thin-provisioning/mapping_tree.cc index a73dc3a..4d7d998 100644 --- a/thin-provisioning/mapping_tree.cc +++ b/thin-provisioning/mapping_tree.cc @@ -229,7 +229,7 @@ void thin_provisioning::walk_mapping_tree(dev_tree const &tree, mapping_tree_detail::device_visitor &dev_v, mapping_tree_detail::damage_visitor &dv, - bool ignore_non_fatal) + bool ignore_non_fatal) { dev_tree_damage_visitor ll_dv(dv); btree_visit_values(tree, dev_v, ll_dv, ignore_non_fatal); @@ -238,7 +238,7 @@ thin_provisioning::walk_mapping_tree(dev_tree const &tree, void thin_provisioning::check_mapping_tree(dev_tree const &tree, mapping_tree_detail::damage_visitor &visitor, - bool ignore_non_fatal) + bool ignore_non_fatal) { noop_block_visitor dev_v; walk_mapping_tree(tree, dev_v, visitor, ignore_non_fatal); @@ -248,7 +248,7 @@ void thin_provisioning::walk_mapping_tree(mapping_tree const &tree, mapping_tree_detail::mapping_visitor &mv, mapping_tree_detail::damage_visitor &dv, - bool ignore_non_fatal) + bool ignore_non_fatal) { mapping_tree_damage_visitor ll_dv(dv); btree_visit_values(tree, mv, ll_dv, ignore_non_fatal); @@ -257,7 +257,7 @@ thin_provisioning::walk_mapping_tree(mapping_tree const &tree, void thin_provisioning::check_mapping_tree(mapping_tree const &tree, mapping_tree_detail::damage_visitor &visitor, - bool ignore_non_fatal) + bool ignore_non_fatal) { noop_block_time_visitor mv; walk_mapping_tree(tree, mv, visitor, ignore_non_fatal); @@ -268,7 +268,7 @@ thin_provisioning::walk_mapping_tree(single_mapping_tree const &tree, uint64_t dev_id, mapping_tree_detail::mapping_visitor &mv, mapping_tree_detail::damage_visitor &dv, - bool ignore_non_fatal) + bool ignore_non_fatal) { single_mapping_tree_damage_visitor ll_dv(dv, dev_id); btree_visit_values(tree, mv, ll_dv, ignore_non_fatal); @@ -278,7 +278,7 @@ void thin_provisioning::check_mapping_tree(single_mapping_tree const &tree, uint64_t dev_id, mapping_tree_detail::damage_visitor &visitor, - bool ignore_non_fatal) + bool ignore_non_fatal) { noop_block_time_visitor mv; walk_mapping_tree(tree, dev_id, mv, visitor, ignore_non_fatal); diff --git a/thin-provisioning/mapping_tree.h b/thin-provisioning/mapping_tree.h index 870d614..24207ed 100644 --- a/thin-provisioning/mapping_tree.h +++ b/thin-provisioning/mapping_tree.h @@ -130,31 +130,31 @@ namespace thin_provisioning { void walk_mapping_tree(dev_tree const &tree, mapping_tree_detail::device_visitor &dev_v, mapping_tree_detail::damage_visitor &dv, - bool ignore_non_fatal = false); + bool ignore_non_fatal = false); void walk_mapping_tree(mapping_tree const &tree, mapping_tree_detail::mapping_visitor &mv, mapping_tree_detail::damage_visitor &dv, - bool ignore_non_fatal = false); + bool ignore_non_fatal = false); void walk_mapping_tree(single_mapping_tree const &tree, uint64_t dev_id, mapping_tree_detail::mapping_visitor &mv, mapping_tree_detail::damage_visitor &dv, - bool ignore_non_fatal = false); - + bool ignore_non_fatal = false); + void check_mapping_tree(single_mapping_tree const &tree, uint64_t dev_id, mapping_tree_detail::damage_visitor &visitor, - bool ignore_non_fatal = false); + bool ignore_non_fatal = false); void check_mapping_tree(dev_tree const &tree, mapping_tree_detail::damage_visitor &visitor, - bool ignore_non_fatal = false); + bool ignore_non_fatal = false); void check_mapping_tree(mapping_tree const &tree, mapping_tree_detail::damage_visitor &visitor, - bool ignore_non_fatal = false); + bool ignore_non_fatal = false); } //---------------------------------------------------------------- diff --git a/thin-provisioning/metadata.cc b/thin-provisioning/metadata.cc index 3c5446a..f6adcb9 100644 --- a/thin-provisioning/metadata.cc +++ b/thin-provisioning/metadata.cc @@ -124,7 +124,7 @@ metadata::metadata(block_manager::ptr bm, throw runtime_error("no current metadata snap"); if (metadata_snap && *metadata_snap != actual_sb.metadata_snap_) - throw runtime_error("metadata snapshot does not match that in superblock"); + throw runtime_error("metadata snapshot does not match that in superblock"); sb_ = read_superblock(bm, actual_sb.metadata_snap_); diff --git a/thin-provisioning/metadata_checker.cc b/thin-provisioning/metadata_checker.cc index dea1b9a..b1feb47 100644 --- a/thin-provisioning/metadata_checker.cc +++ b/thin-provisioning/metadata_checker.cc @@ -151,7 +151,7 @@ namespace { error_state examine_devices_tree_(transaction_manager::ptr tm, superblock_detail::superblock const &sb, nested_output &out, - bool ignore_non_fatal) { + bool ignore_non_fatal) { out << "examining devices tree" << end_message(); nested_output::nest _ = out.push(); @@ -166,7 +166,7 @@ namespace { error_state examine_top_level_mapping_tree_(transaction_manager::ptr tm, superblock_detail::superblock const &sb, nested_output &out, - bool ignore_non_fatal) { + bool ignore_non_fatal) { out << "examining top level of mapping tree" << end_message(); nested_output::nest _ = out.push(); @@ -182,7 +182,7 @@ namespace { superblock_detail::superblock const &sb, nested_output &out, optional data_sm, - bool ignore_non_fatal) { + bool ignore_non_fatal) { out << "examining mapping tree" << end_message(); nested_output::nest _ = out.push(); @@ -202,7 +202,7 @@ namespace { error_state examine_top_level_mapping_tree(transaction_manager::ptr tm, superblock_detail::superblock const &sb, nested_output &out, - bool ignore_non_fatal) { + bool ignore_non_fatal) { error_state err = examine_devices_tree_(tm, sb, out, ignore_non_fatal); err << examine_top_level_mapping_tree_(tm, sb, out, ignore_non_fatal); @@ -212,8 +212,8 @@ namespace { error_state examine_mapping_tree(transaction_manager::ptr tm, superblock_detail::superblock const &sb, nested_output &out, - optional data_sm, - bool ignore_non_fatal) { + optional data_sm, + bool ignore_non_fatal) { error_state err = examine_devices_tree_(tm, sb, out, ignore_non_fatal); err << examine_mapping_tree_(tm, sb, out, data_sm, ignore_non_fatal); @@ -265,7 +265,7 @@ namespace { for (block_address b = 0; b < nr_blocks; b++) { auto a_count = actual->get_count(b); auto e_count = actual->get_count(b); - + if (a_count != e_count) { out << "data reference counts differ for block " << b << ", expected " << e_count