RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-05-04 08:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: mkfs: update subvolume related error messages

Browse Source 
Unify the error message style a bit, print the relevant path if missing.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2025-02-11 05:30:15 +01:00
parent e5d3ba75ab
commit 6afa173ce9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkfs/main.c
View File

@ -1142,7 +1142,7 @@ static int parse_subvolume(const char *path, struct list_head *subvols,
if (subvol->is_default) { if (subvol->is_default) {
if (*has_default_subvol) { if (*has_default_subvol) {
error("default subvol can only be specified once"); error("default subvolume can only be specified once");
free(subvol); free(subvol);
return 1; return 1;
} }
@ -1453,25 +1453,25 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
struct rootdir_subvol *rds2; struct rootdir_subvol *rds2;
if (path_cat_out(path, source_dir, rds->dir)) { if (path_cat_out(path, source_dir, rds->dir)) {
error("path invalid"); error("path invalid: %s", path);
ret = 1; ret = 1;
goto error; goto error;
} }
if (!realpath(path, rds->full_path)) { if (!realpath(path, rds->full_path)) {
error("could not get canonical path to %s", rds->dir); error("could not get canonical path: %s", rds->dir);
ret = 1; ret = 1;
goto error; goto error;
} }
if (!path_exists(rds->full_path)) { if (!path_exists(rds->full_path)) {
error("subvolume %s does not exist", rds->dir); error("subvolume path does not exist: %s", rds->dir);
ret = 1; ret = 1;
goto error; goto error;
} }
if (!path_is_dir(rds->full_path)) { if (!path_is_dir(rds->full_path)) {
error("subvolume %s is not a directory", rds->dir); error("subvolume is not a directory: %s", rds->dir);
ret = 1; ret = 1;
goto error; goto error;
} }
@ -1486,7 +1486,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
rds2 != rds; rds2 != rds;
rds2 = list_next_entry(rds2, list)) { rds2 = list_next_entry(rds2, list)) {
if (strcmp(rds2->full_path, rds->full_path) == 0) { if (strcmp(rds2->full_path, rds->full_path) == 0) {
error("subvolume %s specified more than once", rds->dir); error("subvolume specified more than once: %s", rds->dir);
ret = 1; ret = 1;
goto error; goto error;
} }