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

Merge branch 'v0.7-devel' of github.com:jthornber/thin-provisioning-tools into v0.7-devel

Browse Source
This commit is contained in:
Joe Thornber
2016-06-14 16:33:00 +01:00
parent 642740e1b6 39c6f3d6ea
commit a3eac8d5d8
6 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thin-provisioning/thin_ll_dump.cc
View File

@@ -330,7 +330,7 @@ thin_ll_dump_cmd::run(int argc, char **argv)
boost::optional<string> output;
flags f;
char c;
int c;
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':

6
thin-provisioning/thin_ll_restore.cc
View File

@@ -87,7 +87,7 @@ namespace {
device_tree_detail::device_details details;
device_tree::ptr details_tree;
boost::optional<uint32_t> details_root = get_opt_attr<uint32_t>(attr, "blocknr");
boost::optional<uint64_t> details_root = get_opt_attr<uint64_t>(attr, "blocknr");
if (details_root)
details_tree = device_tree::ptr(new device_tree(*md->tm_, *details_root,
device_tree_detail::device_details_traits::ref_counter()));
@@ -112,7 +112,7 @@ namespace {
}
void parse_node(metadata::ptr md, emitter::ptr e, attributes const &attr) {
metadata_dump_subtree(md, e, true, get_attr<uint32_t>(attr, "blocknr"));
metadata_dump_subtree(md, e, true, get_attr<uint64_t>(attr, "blocknr"));
}
void start_tag(void *data, char const *el, char const **attr) {
@@ -216,7 +216,7 @@ thin_ll_restore_cmd::run(int argc, char **argv) {
string output;
string input_metadata;
flags f;
char c;
int c;
const char shortopts[] = "hi:o:E:V";
const struct option longopts[] = {

2
thin-provisioning/thin_scan.cc
View File

@@ -383,7 +383,7 @@ thin_scan_cmd::run(int argc, char **argv)
boost::optional<string> output;
flags f;
char c;
int c;
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':