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

Merge branch 'Work_1' of github.com:lvmguy/thin-provisioning-tools into Work_1

Browse Source 
Conflicts:
	Makefile.in
	man8/thin_dump.8
	man8/thin_metadata_size.8
	thin-provisioning/thin_dump.cc
This commit is contained in:
Heinz Mauelshagen
2013-07-19 12:11:28 +02:00
parent dd1e4c1233 9fac224f25
commit d02bcbab56
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
thin-provisioning/thin_dump.cc
View File

@@ -40,7 +40,11 @@ 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_;
@@ -77,7 +81,11 @@ 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;
}