c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: restore: add global verbose option

Browse source 
Propagate global --verbose option down to the btrfs restore subcommand.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2019-11-25 18:39:12 +08:00 committed by David Sterba
parent 7c3b845f9d
commit 502d287265
1 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
cmds/restore.c
View file

@ -51,7 +51,6 @@ static char fs_name[PATH_MAX];
static char path_name[PATH_MAX]; static char path_name[PATH_MAX];
static char symlink_target[PATH_MAX]; static char symlink_target[PATH_MAX];
static int get_snaps = 0; static int get_snaps = 0;
static int verbose = 0;
static int restore_metadata = 0; static int restore_metadata = 0;
static int restore_symlinks = 0; static int restore_symlinks = 0;
static int ignore_errors = 0; static int ignore_errors = 0;
@ -386,8 +385,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
size_left -= offset; size_left -= offset;
} }
if (verbose && offset) pr_verbose(offset ? 1 : 0, "offset is %llu\n", offset);
printf("offset is %Lu\n", offset);
inbuf = malloc(size_left); inbuf = malloc(size_left);
if (!inbuf) { if (!inbuf) {
@ -820,11 +818,13 @@ static int overwrite_ok(const char * path)
if (overwrite) if (overwrite)
return 2; return 2;
if (verbose || !warn) if (!warn) {
printf("Skipping existing file" pr_verbose(-1, "Skipping existing file %s\n", path);
" %s\n", path); pr_verbose(-1, "If you wish to overwrite use -o\n");
if (!warn) } else {
printf("If you wish to overwrite use -o\n"); pr_verbose(1, "Skipping existing file %s\n", path);
}
warn = 1; warn = 1;
return 0; return 0;
} }
@ -899,7 +899,7 @@ static int copy_symlink(struct btrfs_root *root, struct btrfs_key *key,
} }
} }
if (verbose >= 2) if (bconf.verbose >= 2)
printf("SYMLINK: '%s' => '%s'\n", path_name, symlink_target); printf("SYMLINK: '%s' => '%s'\n", path_name, symlink_target);
ret = 0; ret = 0;
@ -977,9 +977,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
leaf = path.nodes[0]; leaf = path.nodes[0];
while (!leaf) { while (!leaf) {
if (verbose > 1) pr_verbose(2,
printf("No leaf after search, looking for the next " "No leaf after search, looking for the next leaf\n");
"leaf\n");
ret = next_leaf(root, &path); ret = next_leaf(root, &path);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Error getting next leaf %d\n", fprintf(stderr, "Error getting next leaf %d\n",
@ -987,9 +986,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
goto out; goto out;
} else if (ret > 0) { } else if (ret > 0) {
/* No more leaves to search */ /* No more leaves to search */
if (verbose) pr_verbose(1,
printf("Reached the end of the tree looking " "Reached the end of the tree looking for the directory\n");
"for the directory\n");
ret = 0; ret = 0;
goto out; goto out;
} }
@ -1013,10 +1011,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
goto out; goto out;
} else if (ret > 0) { } else if (ret > 0) {
/* No more leaves to search */ /* No more leaves to search */
if (verbose) pr_verbose(1,
printf("Reached the end of " "Reached the end of the tree searching the directory\n");
"the tree searching the"
" directory\n");
ret = 0; ret = 0;
goto out; goto out;
} }
@ -1026,14 +1022,12 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
} }
btrfs_item_key_to_cpu(leaf, &found_key, path.slots[0]); btrfs_item_key_to_cpu(leaf, &found_key, path.slots[0]);
if (found_key.objectid != key->objectid) { if (found_key.objectid != key->objectid) {
if (verbose > 1) pr_verbose(2, "Found objectid=%Lu, key=%llu\n",
printf("Found objectid=%Lu, key=%Lu\n", found_key.objectid, key->objectid);
found_key.objectid, key->objectid);
break; break;
} }
if (found_key.type != key->type) { if (found_key.type != key->type) {
if (verbose > 1) pr_verbose(2, "Found type=%u, want=%u\n",
printf("Found type=%u, want=%u\n",
found_key.type, key->type); found_key.type, key->type);
break; break;
} }
@ -1062,8 +1056,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
if (!overwrite_ok(path_name)) if (!overwrite_ok(path_name))
goto next; goto next;
if (verbose) pr_verbose(1, "Restoring %s\n", path_name);
printf("Restoring %s\n", path_name);
if (dry_run) if (dry_run)
goto next; goto next;
fd = open(path_name, O_CREAT|O_WRONLY, 0644); fd = open(path_name, O_CREAT|O_WRONLY, 0644);
@ -1135,8 +1128,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
location.objectid = BTRFS_FIRST_FREE_OBJECTID; location.objectid = BTRFS_FIRST_FREE_OBJECTID;
} }
if (verbose) pr_verbose(1, "Restoring %s\n", path_name);
printf("Restoring %s\n", path_name);
errno = 0; errno = 0;
if (dry_run) if (dry_run)
@ -1199,8 +1191,7 @@ next:
} }
} }
if (verbose) pr_verbose(1, "Done searching %s\n", in_dir);
printf("Done searching %s\n", in_dir);
out: out:
btrfs_release_path(&path); btrfs_release_path(&path);
return ret; return ret;
@ -1410,6 +1401,8 @@ static const char * const cmd_restore_usage[] = {
" you have to use following syntax (possibly quoted):", " you have to use following syntax (possibly quoted):",
" ^/(|home(|/username(|/Desktop(|/.*))))$", " ^/(|home(|/username(|/Desktop(|/.*))))$",
"-c ignore case (--path-regex only)", "-c ignore case (--path-regex only)",
HELPINFO_INSERT_GLOBALS,
HELPINFO_INSERT_VERBOSE,
NULL NULL
}; };
@ -1462,7 +1455,7 @@ static int cmd_restore(const struct cmd_struct *cmd, int argc, char **argv)
get_snaps = 1; get_snaps = 1;
break; break;
case 'v': case 'v':
verbose++; bconf_be_verbose();
break; break;
case 'i': case 'i':
ignore_errors = 1; ignore_errors = 1;