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

Fluff

Browse Source
This commit is contained in:
Heinz Mauelshagen 2013-07-19 12:12:31 +02:00
parent d02bcbab56
commit 28a8351e12
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
thin-provisioning/thin_dump.cc
View File

@ -40,11 +40,7 @@ namespace {
int dump(string const &path, ostream *out, string const &format, struct flags &flags,
block_address metadata_snap = 0) {
try {
<<<<<<< HEAD
metadata::ptr md(new metadata(path, metadata_snap));
=======
metadata::ptr md(metadata_snap ? new metadata(path, metadata_snap) : new metadata(path, metadata::OPEN, 0, 0));
>>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
emitter::ptr e;
uint64_t metadata_snap_root = md->sb_.metadata_snap_;
@ -81,11 +77,7 @@ namespace {
<< " {-h|--help}" << endl
<< " {-f|--format} {xml|human_readable}" << endl
<< " {-r|--repair}" << endl
<<<<<<< HEAD
<< " {-m|--metadata-snap} [block#]" << endl
=======
<< " {-m|--metadata-snap} block#" << endl
>>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
<< " {-o <xml file>}" << endl
<< " {-V|--version}" << endl;
}