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

btrfs-progs: Improve the errno string about open_path_or_dev_mnt()

Browse Source 
open_path_or_dev_mnt() is used to on *mounted* btrfs device or mount
point, when a unmounted btrfs device is passed, errno is set to EINVAL to
info the caller.
If ignore the errno and just print "ERROR: can't access '%s'", end users
will get confused.

This patch will add check for open_path_or_dev_mnt() caller and print
more meaningful error message when a unmounted btrfs device path is
given.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Qu Wenruo 2014-04-28 16:37:29 +08:00 committed by David Sterba
parent 24cf4d8c3e
commit b81dd800fc
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmds-device.c
View File

@ -352,7 +352,13 @@ static int cmd_dev_stats(int argc, char **argv)
fdmnt = open_path_or_dev_mnt(dev_path, &dirstream);
if (fdmnt < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", dev_path);
if (errno == EINVAL)
fprintf(stderr,
"ERROR: '%s' is not a mounted btrfs device\n",
dev_path);
else
fprintf(stderr, "ERROR: can't access '%s': %s\n",
dev_path, strerror(errno));
return 1;
}

7
cmds-replace.c
View File

@ -172,7 +172,12 @@ static int cmd_start_replace(int argc, char **argv)
fdmnt = open_path_or_dev_mnt(path, &dirstream);
if (fdmnt < 0) {
fprintf(stderr, "ERROR: can't access \"%s\": %s\n",
if (errno == EINVAL)
fprintf(stderr,
"ERROR: '%s' is not a mounted btrfs device\n",
path);
else
fprintf(stderr, "ERROR: can't access '%s': %s\n",
path, strerror(errno));
goto leave_with_error;
}

23
cmds-scrub.c
View File

@ -1172,7 +1172,13 @@ static int scrub_start(int argc, char **argv, int resume)
fdmnt = open_path_or_dev_mnt(path, &dirstream);
if (fdmnt < 0) {
ERR(!do_quiet, "ERROR: can't access '%s'\n", path);
if (errno == EINVAL)
ERR(!do_quiet,
"ERROR: '%s' is not a mounted btrfs device\n",
path);
else
ERR(!do_quiet, "ERROR: can't access '%s': %s\n",
path, strerror(errno));
return 1;
}
@ -1560,7 +1566,12 @@ static int cmd_scrub_cancel(int argc, char **argv)
fdmnt = open_path_or_dev_mnt(path, &dirstream);
if (fdmnt < 0) {
fprintf(stderr, "ERROR: could not open %s: %s\n",
if (errno == EINVAL)
fprintf(stderr,
"ERROR: '%s' is not a mounted btrfs device\n",
path);
else
fprintf(stderr, "ERROR: can't access '%s': %s\n",
path, strerror(errno));
ret = 1;
goto out;
@ -1658,7 +1669,13 @@ static int cmd_scrub_status(int argc, char **argv)
fdmnt = open_path_or_dev_mnt(path, &dirstream);
if (fdmnt < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", path);
if (errno == EINVAL)
fprintf(stderr,
"ERROR: '%s' is not a mounted btrfs device\n",
path);
else
fprintf(stderr, "ERROR: can't access '%s': %s\n",
path, strerror(errno));
return 1;
}