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

btrfs-progs: no pending balance is not an error 

Having no balance running/ paused/completed is a normal
situation, so the current output message should be positive
with return val zero.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
master
Anand Jain 2013-04-16 12:58:15 +08:00 committed by David Sterba
parent 1c41ab9c4a
commit 9b5a329c6c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmds-balance.c
View File

@ -616,6 +616,12 @@ static const char * const cmd_balance_status_usage[] = {
NULL
};
/* Checks the status of the balance if any
* return codes:
* 2 : Error failed to know if there is any pending balance
* 1 : Successful to know status of a pending balance
* 0 : When there is no pending balance or completed
*/
static int cmd_balance_status(int argc, char **argv)
{
struct btrfs_ioctl_balance_args args;
@ -654,7 +660,7 @@ static int cmd_balance_status(int argc, char **argv)
fd = open_file_or_dir(path);
if (fd < 0) {
fprintf(stderr, "ERROR: can't access to '%s'\n", path);
return 12;
return 2;
}
ret = ioctl(fd, BTRFS_IOC_BALANCE_PROGRESS, &args);
@ -662,9 +668,13 @@ static int cmd_balance_status(int argc, char **argv)
close(fd);
if (ret < 0) {
if (e == ENOTCONN) {
printf("No balance found on '%s'\n", path);
return 0;
}
fprintf(stderr, "ERROR: balance status on '%s' failed - %s\n",
path, (e == ENOTCONN) ? "Not in progress" : strerror(e));
return 19;
path, strerror(e));
return 2;
}
if (args.state & BTRFS_BALANCE_STATE_RUNNING) {
@ -688,7 +698,7 @@ static int cmd_balance_status(int argc, char **argv)
if (verbose)
dump_ioctl_balance_args(&args);
return 0;
return 1;
}
const struct cmd_group balance_cmd_group = {