#include <unistd.h>
#include <getopt.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <errno.h>
#include "kerncompat.h"
#include "commands.h"
#include "utils.h"
+#include "help.h"
static const char * const balance_cmd_group_usage[] = {
"btrfs balance <command> [options] <path>",
{
int fd;
int ret;
- int e;
DIR *dirstream = NULL;
fd = btrfs_open_dir(path, &dirstream, 1);
printf("WARNING:\n\n");
printf("\tFull balance without filters requested. This operation is very\n");
printf("\tintense and takes potentially very long. It is recommended to\n");
- printf("\tuse the balance filters to narrow down the balanced data.\n");
+ printf("\tuse the balance filters to narrow down the scope of balance.\n");
printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
printf("\twarning. The operation will start in %d seconds.\n", delay);
printf("\tUse Ctrl-C to stop it.\n");
}
ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, args);
- e = errno;
-
if (ret < 0) {
/*
* older kernels don't have the new balance ioctl, try the
* old one. But, the old one doesn't know any filters, so
* don't fall back if they tried to use the fancy new things
*/
- if (e == ENOTTY && !(flags & BALANCE_START_FILTERS)) {
+ if (errno == ENOTTY && !(flags & BALANCE_START_FILTERS)) {
ret = do_balance_v1(fd);
if (ret == 0)
goto out;
- e = errno;
}
- if (e == ECANCELED) {
+ if (errno == ECANCELED) {
if (args->state & BTRFS_BALANCE_STATE_PAUSE_REQ)
fprintf(stderr, "balance paused by user\n");
if (args->state & BTRFS_BALANCE_STATE_CANCEL_REQ)
fprintf(stderr, "balance canceled by user\n");
ret = 0;
} else {
- error("error during balancing '%s': %s", path, strerror(e));
- if (e != EINPROGRESS)
+ error("error during balancing '%s': %m", path);
+ if (errno != EINPROGRESS)
fprintf(stderr,
"There may be more info in syslog - try dmesg | tail\n");
ret = 1;
"-v be verbose",
"-f force reducing of metadata integrity",
"--full-balance do not print warning and do not delay start",
+ "--background|--bg",
+ " run the balance as a background process",
NULL
};
&args.meta, NULL };
int force = 0;
int verbose = 0;
+ int background = 0;
unsigned start_flags = 0;
int i;
memset(&args, 0, sizeof(args));
- optind = 1;
while (1) {
- enum { GETOPT_VAL_FULL_BALANCE = 256 };
+ enum { GETOPT_VAL_FULL_BALANCE = 256,
+ GETOPT_VAL_BACKGROUND = 257 };
static const struct option longopts[] = {
{ "data", optional_argument, NULL, 'd'},
{ "metadata", optional_argument, NULL, 'm' },
{ "verbose", no_argument, NULL, 'v' },
{ "full-balance", no_argument, NULL,
GETOPT_VAL_FULL_BALANCE },
+ { "background", no_argument, NULL,
+ GETOPT_VAL_BACKGROUND },
+ { "bg", no_argument, NULL, GETOPT_VAL_BACKGROUND },
{ NULL, 0, NULL, 0 }
};
case GETOPT_VAL_FULL_BALANCE:
start_flags |= BALANCE_START_NOWARN;
break;
+ case GETOPT_VAL_BACKGROUND:
+ background = 1;
+ break;
default:
usage(cmd_balance_start_usage);
}
args.flags |= BTRFS_BALANCE_FORCE;
if (verbose)
dump_ioctl_balance_args(&args);
+ if (background) {
+ switch (fork()) {
+ case (-1):
+ error("unable to fork to run balance in background");
+ return 1;
+ case (0):
+ setsid();
+ switch(fork()) {
+ case (-1):
+ error(
+ "unable to fork to run balance in background");
+ exit(1);
+ case (0):
+ /*
+ * Read the return value to silence compiler
+ * warning. Change to / should succeed and
+ * we're not in a security-sensitive context.
+ */
+ i = chdir("/");
+ close(0);
+ close(1);
+ close(2);
+ open("/dev/null", O_RDONLY);
+ open("/dev/null", O_WRONLY);
+ open("/dev/null", O_WRONLY);
+ break;
+ default:
+ exit(0);
+ }
+ break;
+ default:
+ exit(0);
+ }
+ }
return do_balance(argv[optind], &args, start_flags);
}
const char *path;
int fd;
int ret;
- int e;
DIR *dirstream = NULL;
clean_args_no_options(argc, argv, cmd_balance_pause_usage);
return 1;
ret = ioctl(fd, BTRFS_IOC_BALANCE_CTL, BTRFS_BALANCE_CTL_PAUSE);
- e = errno;
-
if (ret < 0) {
error("balance pause on '%s' failed: %s", path,
- (e == ENOTCONN) ? "Not running" : strerror(e));
- if (e == ENOTCONN)
+ (errno == ENOTCONN) ? "Not running" : strerror(errno));
+ if (errno == ENOTCONN)
ret = 2;
else
ret = 1;
const char *path;
int fd;
int ret;
- int e;
DIR *dirstream = NULL;
clean_args_no_options(argc, argv, cmd_balance_cancel_usage);
return 1;
ret = ioctl(fd, BTRFS_IOC_BALANCE_CTL, BTRFS_BALANCE_CTL_CANCEL);
- e = errno;
-
if (ret < 0) {
error("balance cancel on '%s' failed: %s", path,
- (e == ENOTCONN) ? "Not in progress" : strerror(e));
- if (e == ENOTCONN)
+ (errno == ENOTCONN) ? "Not in progress" : strerror(errno));
+ if (errno == ENOTCONN)
ret = 2;
else
ret = 1;
DIR *dirstream = NULL;
int fd;
int ret;
- int e;
clean_args_no_options(argc, argv, cmd_balance_resume_usage);
args.flags |= BTRFS_BALANCE_RESUME;
ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, &args);
- e = errno;
-
if (ret < 0) {
- if (e == ECANCELED) {
+ if (errno == ECANCELED) {
if (args.state & BTRFS_BALANCE_STATE_PAUSE_REQ)
fprintf(stderr, "balance paused by user\n");
if (args.state & BTRFS_BALANCE_STATE_CANCEL_REQ)
fprintf(stderr, "balance canceled by user\n");
- } else if (e == ENOTCONN || e == EINPROGRESS) {
+ } else if (errno == ENOTCONN || errno == EINPROGRESS) {
error("balance resume on '%s' failed: %s", path,
- (e == ENOTCONN) ? "Not in progress" :
+ (errno == ENOTCONN) ? "Not in progress" :
"Already running");
- if (e == ENOTCONN)
+ if (errno == ENOTCONN)
ret = 2;
else
ret = 1;
} else {
- error("error during balancing '%s': %s\n"
+ error("error during balancing '%s': %m\n"
"There may be more info in syslog - try dmesg | tail",
- path, strerror(e));
+ path);
ret = 1;
}
} else {
int fd;
int verbose = 0;
int ret;
- int e;
- optind = 1;
while (1) {
int opt;
static const struct option longopts[] = {
return 2;
ret = ioctl(fd, BTRFS_IOC_BALANCE_PROGRESS, &args);
- e = errno;
-
if (ret < 0) {
- if (e == ENOTCONN) {
+ if (errno == ENOTCONN) {
printf("No balance found on '%s'\n", path);
ret = 0;
goto out;
}
- error("balance status on '%s' failed: %s", path, strerror(e));
+ error("balance status on '%s' failed: %m", path);
ret = 2;
goto out;
}
projects / platform / upstream / btrfs-progs.git / blobdiff