RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-27 13:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: fi defrag: add global verbose option

Browse Source 
Propagate global --verbose option down to the btrfs receive 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:07 +08:00 committed by David Sterba
parent 177d307229
commit db2f85c875
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/filesystem.c
View File

@ -841,6 +841,8 @@ static const char * const cmd_filesystem_defrag_usage[] = {
"-l len defragment only up to len bytes", "-l len defragment only up to len bytes",
"-t size target extent size hint (default: 32M)", "-t size target extent size hint (default: 32M)",
"", "",
HELPINFO_INSERT_GLOBALS,
HELPINFO_INSERT_VERBOSE,
"Warning: most Linux kernels will break up the ref-links of COW data", "Warning: most Linux kernels will break up the ref-links of COW data",
"(e.g., files copied with 'cp --reflink', snapshots) which may cause", "(e.g., files copied with 'cp --reflink', snapshots) which may cause",
"considerable increase of space usage. See btrfs-filesystem(8) for", "considerable increase of space usage. See btrfs-filesystem(8) for",
@ -849,7 +851,6 @@ static const char * const cmd_filesystem_defrag_usage[] = {
}; };
static struct btrfs_ioctl_defrag_range_args defrag_global_range; static struct btrfs_ioctl_defrag_range_args defrag_global_range;
static int defrag_global_verbose;
static int defrag_global_errors; static int defrag_global_errors;
static int defrag_callback(const char *fpath, const struct stat *sb, static int defrag_callback(const char *fpath, const struct stat *sb,
int typeflag, struct FTW *ftwbuf) int typeflag, struct FTW *ftwbuf)
@ -858,8 +859,7 @@ static int defrag_callback(const char *fpath, const struct stat *sb,
int fd = 0; int fd = 0;
if ((typeflag == FTW_F) && S_ISREG(sb->st_mode)) { if ((typeflag == FTW_F) && S_ISREG(sb->st_mode)) {
if (defrag_global_verbose) pr_verbose(1, "%s\n", fpath);
printf("%s\n", fpath);
fd = open(fpath, defrag_open_mode); fd = open(fpath, defrag_open_mode);
if (fd < 0) { if (fd < 0) {
goto error; goto error;
@ -914,7 +914,6 @@ static int cmd_filesystem_defrag(const struct cmd_struct *cmd,
thresh = SZ_32M; thresh = SZ_32M;
defrag_global_errors = 0; defrag_global_errors = 0;
defrag_global_verbose = 0;
defrag_global_errors = 0; defrag_global_errors = 0;
optind = 0; optind = 0;
while(1) { while(1) {
@ -932,7 +931,7 @@ static int cmd_filesystem_defrag(const struct cmd_struct *cmd,
flush = 1; flush = 1;
break; break;
case 'v': case 'v':
defrag_global_verbose = 1; bconf_be_verbose();
break; break;
case 's': case 's':
start = parse_size(optarg); start = parse_size(optarg);
@ -1032,8 +1031,7 @@ static int cmd_filesystem_defrag(const struct cmd_struct *cmd,
/* errors are handled in the callback */ /* errors are handled in the callback */
ret = 0; ret = 0;
} else { } else {
if (defrag_global_verbose) pr_verbose(1, "%s\n", argv[i]);
printf("%s\n", argv[i]);
ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE, ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE,
&defrag_global_range); &defrag_global_range);
defrag_err = errno; defrag_err = errno;