From bdb8d6e5ccb7168b3839e4198d425e3cf7d878f7 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 30 Jul 2013 17:10:41 +0200 Subject: [PATCH] thin_dump: cleanup metadata snapshot support --- thin-provisioning/metadata.cc | 2 +- thin-provisioning/thin_dump.cc | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/thin-provisioning/metadata.cc b/thin-provisioning/metadata.cc index bef75ba..23317db 100644 --- a/thin-provisioning/metadata.cc +++ b/thin-provisioning/metadata.cc @@ -148,7 +148,7 @@ metadata::metadata(std::string const &dev_path, block_address metadata_snap) // We don't open the metadata sm for a held root //metadata_sm_ = open_metadata_sm(tm_, &sb_.metadata_space_map_root_); - tm_->set_sm(metadata_sm_); + //tm_->set_sm(metadata_sm_); data_sm_ = open_disk_sm(tm_, static_cast(&sb_.data_space_map_root_)); details_ = device_tree::ptr(new device_tree(tm_, sb_.device_details_root_, device_tree_detail::device_details_traits::ref_counter())); diff --git a/thin-provisioning/thin_dump.cc b/thin-provisioning/thin_dump.cc index 944b7ae..6b3e910 100644 --- a/thin-provisioning/thin_dump.cc +++ b/thin-provisioning/thin_dump.cc @@ -42,9 +42,10 @@ namespace { try { metadata::ptr md(new metadata(path, metadata_snap)); emitter::ptr e; - uint64_t metadata_snap_root = md->sb_.metadata_snap_; /* FIXME: use thin_pool method? */ if (flags.find_metadata_snap) { + uint64_t metadata_snap_root = md->sb_.metadata_snap_; /* FIXME: use thin_pool method? */ + if (metadata_snap_root) { md.reset(); md = metadata::ptr(new metadata(path, metadata_snap_root)); @@ -119,10 +120,6 @@ int main(int argc, char **argv) flags.repair = true; break; - case 's': - flags.find_metadata_snap = true; - break; - case 'm': if (optarg) { metadata_snap = strtoull(optarg, &end_ptr, 10);