From 32ca2fa502c0a00a7dc40adbdae2e7b7765e6d63 Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 13 Apr 2015 20:37:01 +0800 Subject: btrfs-progs: improve troubleshooting avoid duplicate error strings my troubleshooting experience says have unique error string per module. In the below eg, its one additional step to know error line, cat -n cmds-device.c | egrep "error removing the device" 185 "ERROR: error removing the device '%s' - %s\n", 190 "ERROR: error removing the device '%s' - %s\n", which is completely avoidable. Signed-off-by: Anand Jain [merged the two messages into one] Signed-off-by: David Sterba --- cmds-device.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index f9ac7f5f..9a7287a6 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -180,15 +180,16 @@ static int cmd_rm_dev(int argc, char **argv) strncpy_null(arg.name, argv[i]); res = ioctl(fdmnt, BTRFS_IOC_RM_DEV, &arg); e = errno; - if (res > 0) { - fprintf(stderr, - "ERROR: error removing the device '%s' - %s\n", - argv[i], btrfs_err_str(res)); - ret++; - } else if (res < 0) { + if (res) { + const char *msg; + + if (ret > 0) + msg = btrfs_err_str(res); + else + msg = strerror(e); fprintf(stderr, "ERROR: error removing the device '%s' - %s\n", - argv[i], strerror(e)); + argv[i], msg); ret++; } } -- cgit v1.2.3