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

btrfs-progs: cmd replace: switch to common error message wrapper

Browse source 
Message texts were adjusted.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-01-11 11:01:47 +01:00
parent e7e759017d
commit edbdd06e25
1 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cmds-replace.c
View file

@ -179,25 +179,21 @@ static int cmd_replace_start(int argc, char **argv)
}
if (status_args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR) {
fprintf(stderr,
"ERROR: ioctl(DEV_REPLACE_STATUS) on \"%s\" returns error: %s\n",
error("ioctl(DEV_REPLACE_STATUS) on '%s' returns error: %s",
path, replace_dev_result2string(status_args.result));
goto leave_with_error;
}
if (status_args.status.replace_state ==
BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED) {
fprintf(stderr,
"ERROR: btrfs replace on \"%s\" already started!\n",
path);
error("device replace on '%s' already started", path);
goto leave_with_error;
}
srcdev = argv[optind];
dstdev = canonicalize_path(argv[optind + 1]);
if (!dstdev) {
fprintf(stderr,
"ERROR: Could not canonicalize path '%s': %s\n",
error("cannot canonicalize path '%s': %s",
argv[optind + 1], strerror(errno));
goto leave_with_error;
}
@ -210,13 +206,12 @@ static int cmd_replace_start(int argc, char **argv)
ret = get_fs_info(path, &fi_args, &di_args);
if (ret) {
fprintf(stderr, "ERROR: getting dev info for devstats failed: "
"%s\n", strerror(-ret));
error("failed to get device info: %s", strerror(-ret));
free(di_args);
goto leave_with_error;
}
if (!fi_args.num_devices) {
fprintf(stderr, "ERROR: no devices found\n");
error("no devices found");
free(di_args);
goto leave_with_error;
}
@ -227,7 +222,7 @@ static int cmd_replace_start(int argc, char **argv)
srcdev_size = di_args[i].total_bytes;
free(di_args);
if (i == fi_args.num_devices) {
fprintf(stderr, "Error: '%s' is not a valid devid for filesystem '%s'\n",
error("'%s' is not a valid devid for filesystem '%s'",
srcdev, path);
goto leave_with_error;
}
@ -237,7 +232,7 @@ static int cmd_replace_start(int argc, char **argv)
start_args.start.srcdevid = 0;
srcdev_size = get_partition_size(srcdev);
} else {
fprintf(stderr, "ERROR: source device must be a block device or a devid\n");
error("source device must be a block device or a devid");
goto leave_with_error;
}
@ -247,14 +242,14 @@ static int cmd_replace_start(int argc, char **argv)
dstdev_size = get_partition_size(dstdev);
if (srcdev_size > dstdev_size) {
fprintf(stderr, "ERROR: target device smaller than source device (required %llu bytes)\n",
error("target device smaller than source device (required %llu bytes)",
srcdev_size);
goto leave_with_error;
}
fddstdev = open(dstdev, O_RDWR);
if (fddstdev < 0) {
fprintf(stderr, "Unable to open %s\n", dstdev);
error("unable to open %s: %s", dstdev, strerror(errno));
goto leave_with_error;
}
strncpy((char *)start_args.start.tgtdev_name, dstdev,
@ -272,8 +267,7 @@ static int cmd_replace_start(int argc, char **argv)
dev_replace_handle_sigint(fdmnt);
if (!do_not_background) {
if (daemon(0, 0) < 0) {
fprintf(stderr, "ERROR, backgrounding failed: %s\n",
strerror(errno));
error("backgrounding failed: %s", strerror(errno));
goto leave_with_error;
}
}
@ -293,16 +287,14 @@ static int cmd_replace_start(int argc, char **argv)
fprintf(stderr, "\n");
if (errno == EOPNOTSUPP)
fprintf(stderr,
"WARNING: dev_replace does not yet handle RAID5/6\n");
warning("device replace of RAID5/6 not supported with this kernel");
goto leave_with_error;
}
if (start_args.result !=
BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR) {
fprintf(stderr,
"ERROR: ioctl(DEV_REPLACE_START) on \"%s\" returns error: %s\n",
error("ioctl(DEV_REPLACE_START) on '%s' returns error: %s",
path,
replace_dev_result2string(start_args.result));
goto leave_with_error;
@ -392,7 +384,7 @@ static int print_replace_status(int fd, const char *path, int once)
}
if (args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR) {
fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_STATUS) on \"%s\" returns error: %s\n",
error("ioctl(DEV_REPLACE_STATUS) on '%s' returns error: %s",
path,
replace_dev_result2string(args.result));
return -1;
@ -444,8 +436,7 @@ static int print_replace_status(int fd, const char *path, int once)
printf("Never started");
break;
default:
fprintf(stderr,
"ERROR: ioctl(DEV_REPLACE_STATUS) on \"%s\" got unknown status: %llu\n",
error("unknown status from ioctl DEV_REPLACE_STATUS on '%s': %llu\n",
path, status->replace_state);
return -EINVAL;
}