RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-25 23:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: improve troubleshooting avoid duplicate error strings

Browse Source 
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 <anand.jain@oracle.com>
[merged the two messages into one]
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Anand Jain 2015-04-13 20:37:01 +08:00 committed by David Sterba
parent 672076d4b7
commit 32ca2fa502
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmds-device.c
View File

@ -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) {
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], btrfs_err_str(res));
ret++;
} else if (res < 0) {
fprintf(stderr,
"ERROR: error removing the device '%s' - %s\n",
argv[i], strerror(e));
argv[i], msg);
ret++;
}
}