From 7eac48793caf1146bd2ff9937a99e9fb7c031e18 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Mon, 20 Jun 2016 00:40:10 +0800 Subject: [PATCH] [space map disk] tidy up: add const qualifier --- persistent-data/space-maps/disk.cc | 4 ++-- persistent-data/space-maps/disk.h | 4 ++-- thin-provisioning/metadata_counter.cc | 10 +++++----- thin-provisioning/metadata_counter.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/persistent-data/space-maps/disk.cc b/persistent-data/space-maps/disk.cc index 9c51921..caeaca3 100644 --- a/persistent-data/space-maps/disk.cc +++ b/persistent-data/space-maps/disk.cc @@ -742,7 +742,7 @@ persistent_data::create_disk_sm(transaction_manager &tm, } checked_space_map::ptr -persistent_data::open_disk_sm(transaction_manager &tm, void *root) +persistent_data::open_disk_sm(transaction_manager &tm, void const *root) { sm_root_disk d; sm_root v; @@ -770,7 +770,7 @@ persistent_data::create_metadata_sm(transaction_manager &tm, block_address nr_bl } checked_space_map::ptr -persistent_data::open_metadata_sm(transaction_manager &tm, void *root) +persistent_data::open_metadata_sm(transaction_manager &tm, void const *root) { sm_root_disk d; sm_root v; diff --git a/persistent-data/space-maps/disk.h b/persistent-data/space-maps/disk.h index 9edef6b..906221e 100644 --- a/persistent-data/space-maps/disk.h +++ b/persistent-data/space-maps/disk.h @@ -29,13 +29,13 @@ namespace persistent_data { create_disk_sm(transaction_manager &tm, block_address nr_blocks); checked_space_map::ptr - open_disk_sm(transaction_manager &tm, void *root); + open_disk_sm(transaction_manager &tm, void const *root); checked_space_map::ptr create_metadata_sm(transaction_manager &tm, block_address nr_blocks); checked_space_map::ptr - open_metadata_sm(transaction_manager &tm, void *root); + open_metadata_sm(transaction_manager &tm, void const *root); bcache::validator::ptr bitmap_validator(); diff --git a/thin-provisioning/metadata_counter.cc b/thin-provisioning/metadata_counter.cc index a928056..95487d2 100644 --- a/thin-provisioning/metadata_counter.cc +++ b/thin-provisioning/metadata_counter.cc @@ -9,7 +9,7 @@ using namespace thin_provisioning; namespace { void count_trees(transaction_manager::ptr tm, - superblock_detail::superblock &sb, + superblock_detail::superblock const &sb, block_counter &bc) { // Count the device tree @@ -30,12 +30,12 @@ namespace { } void count_space_maps(transaction_manager::ptr tm, - superblock_detail::superblock &sb, + superblock_detail::superblock const &sb, block_counter &bc) { // Count the metadata space map (no-throw) try { persistent_space_map::ptr metadata_sm = - open_metadata_sm(*tm, static_cast(&sb.metadata_space_map_root_)); + open_metadata_sm(*tm, static_cast(&sb.metadata_space_map_root_)); metadata_sm->count_metadata(bc); } catch (std::exception &e) { cerr << e.what() << endl; @@ -44,7 +44,7 @@ namespace { // Count the data space map (no-throw) { persistent_space_map::ptr data_sm = - open_disk_sm(*tm, static_cast(&sb.data_space_map_root_)); + open_disk_sm(*tm, static_cast(&sb.data_space_map_root_)); data_sm->count_metadata(bc); } } @@ -53,7 +53,7 @@ namespace { //---------------------------------------------------------------- void thin_provisioning::count_metadata(transaction_manager::ptr tm, - superblock_detail::superblock &sb, + superblock_detail::superblock const &sb, block_counter &bc, bool skip_metadata_snap) { // Count the superblock diff --git a/thin-provisioning/metadata_counter.h b/thin-provisioning/metadata_counter.h index 67801e8..bc65ab9 100644 --- a/thin-provisioning/metadata_counter.h +++ b/thin-provisioning/metadata_counter.h @@ -8,7 +8,7 @@ namespace thin_provisioning { void count_metadata(transaction_manager::ptr tm, - superblock_detail::superblock &sb, + superblock_detail::superblock const &sb, block_counter &bc, bool skip_metadata_snap = false); }