marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: report failure when resize ioctl fails 

The BTRFS_IOC_RESIZE ioctl returns 0 on success, negative for POSIX
errors, and positive for btrfs-specific errors.

If resize fails with a btrfs-specific error, decode the error and
report it.  If we can't decode the error, report its numeric value so
that the userspace tool is not instantly useless when a new error code
is defined in the kernel.

Exit with non-zero status on any resize error.  This is very important
for scripts that will shrink the underlying storage when btrfs reports
success!

Signed-off-by: Zygo Blaxell <ce3g8jdj@umail.furryterror.org
Signed-off-by: David Sterba <dsterba@suse.cz>
master
Zygo Blaxell 2015-04-21 23:38:47 -04:00 committed by David Sterba
parent 2890c41504
commit 7ab0bdd712
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmds-filesystem.c
View File

@ -1278,6 +1278,18 @@ static int cmd_resize(int argc, char **argv)
fprintf(stderr, "ERROR: unable to resize '%s' - %s\n",
path, strerror(e));
return 1;
} else if (res > 0) {
const char *err_str = btrfs_err_str(res);
if (err_str) {
fprintf(stderr, "ERROR: btrfs error resizing '%s' - %s\n",
path, err_str);
} else {
fprintf(stderr,
"ERROR: btrfs error resizing '%s' - unknown btrfs_err_code %d\n",
path, res);
}
return 1;
}
return 0;
}