X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-scrub.c;h=dabe7d9a2db0cb12eedf7eadbb96d5fcda0df269;hb=89f5a8f97ca8c53759a1dcd8117808db2086643f;hp=ca11fb597afd750d1d4ed7b0036c818a80d424c5;hpb=5d483022363254229afff73f79ecd6dd19910dab;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/cmds-scrub.c b/cmds-scrub.c index ca11fb5..dabe7d9 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -17,6 +17,7 @@ */ #include "kerncompat.h" +#include "androidcompat.h" #include #include @@ -34,6 +35,7 @@ #include #include #include +#include #include "ctree.h" #include "ioctl.h" @@ -42,6 +44,7 @@ #include "disk-io.h" #include "commands.h" +#include "help.h" static const char * const scrub_cmd_group_usage[] = { "btrfs scrub [options] |", @@ -59,6 +62,7 @@ struct scrub_stats { u64 duration; u64 finished; u64 canceled; + int in_progress; }; /* TBD: replace with #include "linux/ioprio.h" in some years */ @@ -125,11 +129,6 @@ static void print_scrub_full(struct btrfs_scrub_progress *sp) printf("\tlast_physical: %lld\n", sp->last_physical); } -#define ERR(test, ...) do { \ - if (test) \ - fprintf(stderr, __VA_ARGS__); \ -} while (0) - #define PRINT_SCRUB_ERROR(test, desc) do { \ if (test) \ printf(" %s=%llu", desc, test); \ @@ -228,6 +227,8 @@ static void _print_scrub_ss(struct scrub_stats *ss) { char t[4096]; struct tm tm; + time_t seconds; + unsigned hours; if (!ss || !ss->t_start) { printf("\tno stats available\n"); @@ -244,15 +245,20 @@ static void _print_scrub_ss(struct scrub_stats *ss) t[sizeof(t) - 1] = '\0'; printf("\tscrub started at %s", t); } - if (ss->finished && !ss->canceled) { - printf(" and finished after %llu seconds\n", - ss->duration); - } else if (ss->canceled) { - printf(" and was aborted after %llu seconds\n", - ss->duration); - } else { - printf(", running for %llu seconds\n", ss->duration); - } + + seconds = ss->duration; + hours = ss->duration / (60 * 60); + gmtime_r(&seconds, &tm); + strftime(t, sizeof(t), "%M:%S", &tm); + if (ss->in_progress) + printf(", running for %02u:%s\n", hours, t); + else if (ss->canceled) + printf(" and was aborted after %02u:%s\n", hours, t); + else if (ss->finished) + printf(" and finished after %02u:%s\n", hours, t); + else + printf(", interrupted after %02u:%s, not running\n", + hours, t); } static void print_scrub_dev(struct btrfs_ioctl_dev_info_args *di, @@ -380,7 +386,7 @@ static int scrub_open_file(const char *datafile, int m) static int scrub_open_file_r(const char *fn_base, const char *fn_local) { int ret; - char datafile[BTRFS_PATH_NAME_MAX + 1]; + char datafile[PATH_MAX]; ret = scrub_datafile(fn_base, fn_local, NULL, datafile, sizeof(datafile)); if (ret < 0) @@ -392,7 +398,7 @@ static int scrub_open_file_w(const char *fn_base, const char *fn_local, const char *tmp) { int ret; - char datafile[BTRFS_PATH_NAME_MAX + 1]; + char datafile[PATH_MAX]; ret = scrub_datafile(fn_base, fn_local, tmp, datafile, sizeof(datafile)); if (ret < 0) @@ -404,8 +410,8 @@ static int scrub_rename_file(const char *fn_base, const char *fn_local, const char *tmp) { int ret; - char datafile_old[BTRFS_PATH_NAME_MAX + 1]; - char datafile_new[BTRFS_PATH_NAME_MAX + 1]; + char datafile_old[PATH_MAX]; + char datafile_new[PATH_MAX]; ret = scrub_datafile(fn_base, fn_local, tmp, datafile_old, sizeof(datafile_old)); if (ret < 0) @@ -425,7 +431,7 @@ static int scrub_rename_file(const char *fn_base, const char *fn_local, /* * returns 0 if the key did not match (nothing was read) * 1 if the key did match (success) - * -1 if the key did match and an error occured + * -1 if the key did match and an error occurred */ static int scrub_kvread(int *i, int len, int avail, const char *buf, const char *key, u64 *dest) @@ -451,8 +457,8 @@ static int scrub_kvread(int *i, int len, int avail, const char *buf, #define _SCRUB_INVALID do { \ if (report_errors) \ - fprintf(stderr, "WARNING: invalid data in line %d pos " \ - "%d state %d (near \"%.*s\") at %s:%d\n", \ + warning("invalid data on line %d pos " \ + "%d state %d (near \"%.*s\") at %s:%d", \ lineno, i, state, 20 > avail ? avail : 20, \ l + i, __FILE__, __LINE__); \ goto skip; \ @@ -462,7 +468,7 @@ static struct scrub_file_record **scrub_read_file(int fd, int report_errors) { int avail = 0; int old_avail = 0; - char l[16 * 1024]; + char l[SZ_16K]; int state = 0; int curr = -1; int i = 0; @@ -474,12 +480,12 @@ static struct scrub_file_record **scrub_read_file(int fd, int report_errors) char empty_uuid[BTRFS_FSID_SIZE] = {0}; struct scrub_file_record **p = NULL; - if (fd < 0) - return ERR_PTR(-EINVAL); - again: old_avail = avail - i; - BUG_ON(old_avail < 0); + if (old_avail < 0) { + error("scrub record file corrupted near byte %d", i); + return ERR_PTR(-EINVAL); + } if (old_avail) memmove(l, l + i, old_avail); avail = read(fd, l + old_avail, sizeof(l) - old_avail); @@ -494,12 +500,16 @@ again: } return p; } - if (avail == -1) + if (avail == -1) { + free_history(p); return ERR_PTR(-errno); + } avail += old_avail; i = 0; while (i < avail) { + void *tmp; + switch (state) { case 0: /* start of file */ ret = scrub_kvread(&i, @@ -526,11 +536,17 @@ again: continue; } ++curr; + tmp = p; p = realloc(p, (curr + 2) * sizeof(*p)); - if (p) - p[curr] = malloc(sizeof(**p)); - if (!p || !p[curr]) + if (!p) { + free_history(tmp); + return ERR_PTR(-errno); + } + p[curr] = malloc(sizeof(**p)); + if (!p[curr]) { + free_history(p); return ERR_PTR(-errno); + } memset(p[curr], 0, sizeof(**p)); p[curr + 1] = NULL; ++state; @@ -553,7 +569,7 @@ again: ; if (i + j + 1 >= avail) _SCRUB_INVALID; - if (j != 36) + if (j != BTRFS_UUID_UNPARSED_SIZE - 1) _SCRUB_INVALID; l[i + j] = '\0'; ret = uuid_parse(l + i, p[curr]->fsid); @@ -638,7 +654,9 @@ skip: } while (i < avail); continue; } - BUG(); + error("internal error: unknown parser state %d near byte %d", + state, i); + return ERR_PTR(-EINVAL); } goto again; } @@ -773,31 +791,31 @@ static int scrub_write_progress(pthread_mutex_t *m, const char *fsid, int fd = -1; int old; - ret = pthread_mutex_lock(m); + ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old); if (ret) { err = -ret; - goto fail; + goto out3; } - ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old); + ret = pthread_mutex_lock(m); if (ret) { err = -ret; - goto out; + goto out2; } fd = scrub_open_file_w(SCRUB_DATA_FILE, fsid, "tmp"); if (fd < 0) { err = fd; - goto out; + goto out1; } err = scrub_write_file(fd, fsid, data, n); if (err) - goto out; + goto out1; err = scrub_rename_file(SCRUB_DATA_FILE, fsid, "tmp"); if (err) - goto out; + goto out1; -out: +out1: if (fd >= 0) { ret = close(fd); if (ret) @@ -808,11 +826,12 @@ out: if (ret && !err) err = -ret; -fail: +out2: ret = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old); if (ret && !err) err = -ret; +out3: return err; } @@ -830,9 +849,7 @@ static void *scrub_one_dev(void *ctx) IOPRIO_PRIO_VALUE(sp->ioprio_class, sp->ioprio_classdata)); if (ret) - fprintf(stderr, - "WARNING: setting ioprio failed: %s (ignored).\n", - strerror(errno)); + warning("setting ioprio failed: %m (ignored)"); ret = ioctl(sp->fd, BTRFS_IOC_SCRUB, &sp->scrub_args); gettimeofday(&tv, NULL); @@ -864,7 +881,7 @@ static void *progress_one_dev(void *ctx) /* nb: returns a negative errno via ERR_PTR */ static void *scrub_progress_cycle(void *ctx) { - int ret; + int ret = 0; int perr = 0; /* positive / pthread error returns */ int old; int i; @@ -944,6 +961,10 @@ static void *scrub_progress_cycle(void *ctx) * result we got for the current write and go * on. flag should be set on next cycle, then. */ + perr = pthread_setcancelstate( + PTHREAD_CANCEL_DISABLE, &old); + if (perr) + goto out; perr = pthread_mutex_lock(&sp_shared->progress_mutex); if (perr) goto out; @@ -952,12 +973,20 @@ static void *scrub_progress_cycle(void *ctx) &sp_shared->progress_mutex); if (perr) goto out; + perr = pthread_setcancelstate( + PTHREAD_CANCEL_ENABLE, &old); + if (perr) + goto out; memcpy(sp, sp_last, sizeof(*sp)); continue; } perr = pthread_mutex_unlock(&sp_shared->progress_mutex); if (perr) goto out; + perr = pthread_setcancelstate( + PTHREAD_CANCEL_ENABLE, &old); + if (perr) + goto out; memcpy(sp, sp_shared, sizeof(*sp)); memcpy(sp_last, sp_shared, sizeof(*sp)); } @@ -1047,6 +1076,24 @@ static int is_scrub_running_on_fs(struct btrfs_ioctl_fs_info_args *fi_args, return 0; } +static int is_scrub_running_in_kernel(int fd, + struct btrfs_ioctl_dev_info_args *di_args, u64 max_devices) +{ + struct scrub_progress sp; + int i; + int ret; + + for (i = 0; i < max_devices; i++) { + memset(&sp, 0, sizeof(sp)); + sp.scrub_args.devid = di_args[i].devid; + ret = ioctl(fd, BTRFS_IOC_SCRUB_PROGRESS, &sp.scrub_args); + if (!ret) + return 1; + } + + return 0; +} + static const char * const cmd_scrub_start_usage[]; static const char * const cmd_scrub_resume_usage[]; @@ -1086,12 +1133,11 @@ static int scrub_start(int argc, char **argv, int resume) }; pthread_t *t_devs = NULL; pthread_t t_prog; - pthread_attr_t t_attr; struct scrub_file_record **past_scrubs = NULL; struct scrub_file_record *last_scrub = NULL; char *datafile = strdup(SCRUB_DATA_FILE); char fsid[BTRFS_UUID_UNPARSED_SIZE]; - char sock_path[BTRFS_PATH_NAME_MAX + 1] = ""; + char sock_path[PATH_MAX] = ""; struct scrub_progress_cycle spc; pthread_mutex_t spc_write_mutex = PTHREAD_MUTEX_INITIALIZER; void *terr; @@ -1100,7 +1146,6 @@ static int scrub_start(int argc, char **argv, int resume) int force = 0; int nothing_to_resume = 0; - optind = 1; while ((c = getopt(argc, argv, "BdqrRc:n:f")) != -1) { switch (c) { case 'B': @@ -1148,31 +1193,29 @@ static int scrub_start(int argc, char **argv, int resume) do_print = 0; if (mkdir_p(datafile)) { - ERR(!do_quiet, "WARNING: cannot create scrub data " - "file, mkdir %s failed: %s. Status recording " - "disabled\n", datafile, strerror(errno)); + warning_on(!do_quiet, + "cannot create scrub data file, mkdir %s failed: %m. Status recording disabled", + datafile); do_record = 0; } free(datafile); path = argv[optind]; - fdmnt = open_path_or_dev_mnt(path, &dirstream); - - if (fdmnt < 0) { - ERR(!do_quiet, "ERROR: can't access '%s'\n", path); + fdmnt = open_path_or_dev_mnt(path, &dirstream, !do_quiet); + if (fdmnt < 0) return 1; - } ret = get_fs_info(path, &fi_args, &di_args); if (ret) { - ERR(!do_quiet, "ERROR: getting dev info for scrub failed: " - "%s\n", strerror(-ret)); + error_on(!do_quiet, + "getting dev info for scrub failed: %s", + strerror(-ret)); err = 1; goto out; } if (!fi_args.num_devices) { - ERR(!do_quiet, "ERROR: no devices found\n"); + error_on(!do_quiet, "no devices found"); err = 1; goto out; } @@ -1180,17 +1223,24 @@ static int scrub_start(int argc, char **argv, int resume) uuid_unparse(fi_args.fsid, fsid); fdres = scrub_open_file_r(SCRUB_DATA_FILE, fsid); if (fdres < 0 && fdres != -ENOENT) { - ERR(!do_quiet, "WARNING: failed to open status file: " - "%s\n", strerror(-fdres)); + warning_on(!do_quiet, "failed to open status file: %s", + strerror(-fdres)); } else if (fdres >= 0) { past_scrubs = scrub_read_file(fdres, !do_quiet); if (IS_ERR(past_scrubs)) - ERR(!do_quiet, "WARNING: failed to read status file: " - "%s\n", strerror(-PTR_ERR(past_scrubs))); + warning_on(!do_quiet, "failed to read status file: %s", + strerror(-PTR_ERR(past_scrubs))); close(fdres); } /* + * Check for stale information in the status file, ie. if it's + * canceled=0, finished=0 but no scrub is running. + */ + if (!is_scrub_running_in_kernel(fdmnt, di_args, fi_args.num_devices)) + force = 1; + + /* * check whether any involved device is already busy running a * scrub. This would cause damaged status messages and the state * "aborted" without the explanation that a scrub was already @@ -1202,11 +1252,11 @@ static int scrub_start(int argc, char **argv, int resume) * single devices, there is no reason to prevent this. */ if (!force && is_scrub_running_on_fs(&fi_args, di_args, past_scrubs)) { - ERR(!do_quiet, - "ERROR: scrub is already running.\n" - "To cancel use 'btrfs scrub cancel %s'.\n" - "To see the status use 'btrfs scrub status [-d] %s'.\n", - path, path); + error_on(!do_quiet, + "Scrub is already running.\n" + "To cancel use 'btrfs scrub cancel %s'.\n" + "To see the status use 'btrfs scrub status [-d] %s'", + path, path); err = 1; goto out; } @@ -1216,15 +1266,7 @@ static int scrub_start(int argc, char **argv, int resume) spc.progress = calloc(fi_args.num_devices * 2, sizeof(*spc.progress)); if (!t_devs || !sp || !spc.progress) { - ERR(!do_quiet, "ERROR: scrub failed: %s", strerror(errno)); - err = 1; - goto out; - } - - ret = pthread_attr_init(&t_attr); - if (ret) { - ERR(!do_quiet, "ERROR: pthread_attr_init failed: %s\n", - strerror(ret)); + error_on(!do_quiet, "scrub failed: %m"); err = 1; goto out; } @@ -1233,8 +1275,8 @@ static int scrub_start(int argc, char **argv, int resume) devid = di_args[i].devid; ret = pthread_mutex_init(&sp[i].progress_mutex, NULL); if (ret) { - ERR(!do_quiet, "ERROR: pthread_mutex_init failed: " - "%s\n", strerror(ret)); + error_on(!do_quiet, "pthread_mutex_init failed: %s", + strerror(ret)); err = 1; goto out; } @@ -1288,7 +1330,7 @@ static int scrub_start(int argc, char **argv, int resume) ret = connect(prg_fd, (struct sockaddr *)&addr, sizeof(addr)); if (!ret || errno != ECONNREFUSED) { /* ... yes, so scrub must be running. error out */ - fprintf(stderr, "ERROR: scrub already running\n"); + error("scrub already running"); close(prg_fd); prg_fd = -1; goto out; @@ -1302,10 +1344,10 @@ static int scrub_start(int argc, char **argv, int resume) if (ret != -1) ret = listen(prg_fd, 100); if (ret == -1) { - ERR(!do_quiet, "WARNING: failed to open the progress status " - "socket at %s: %s. Progress cannot be queried\n", - sock_path[0] ? sock_path : SCRUB_PROGRESS_SOCKET_PATH, - strerror(errno)); + warning_on(!do_quiet, + "failed to open the progress status socket at %s: %m. Progress cannot be queried", + sock_path[0] ? sock_path : + SCRUB_PROGRESS_SOCKET_PATH); if (prg_fd != -1) { close(prg_fd); prg_fd = -1; @@ -1319,9 +1361,9 @@ static int scrub_start(int argc, char **argv, int resume) ret = scrub_write_progress(&spc_write_mutex, fsid, sp, fi_args.num_devices); if (ret) { - ERR(!do_quiet, "WARNING: failed to write the progress " - "status file: %s. Status recording disabled\n", - strerror(-ret)); + warning_on(!do_quiet, + "failed to write the progress status file: %s. Status recording disabled", + strerror(-ret)); do_record = 0; } } @@ -1329,8 +1371,7 @@ static int scrub_start(int argc, char **argv, int resume) if (do_background) { pid = fork(); if (pid == -1) { - ERR(!do_quiet, "ERROR: cannot scrub, fork failed: " - "%s\n", strerror(errno)); + error_on(!do_quiet, "cannot scrub, fork failed: %m"); err = 1; goto out; } @@ -1348,13 +1389,13 @@ static int scrub_start(int argc, char **argv, int resume) } ret = wait(&stat); if (ret != pid) { - ERR(!do_quiet, "ERROR: wait failed: (ret=%d) " - "%s\n", ret, strerror(errno)); + error_on(!do_quiet, "wait failed (ret=%d): %m", + ret); err = 1; goto out; } if (!WIFEXITED(stat) || WEXITSTATUS(stat)) { - ERR(!do_quiet, "ERROR: scrub process failed\n"); + error_on(!do_quiet, "scrub process failed"); err = WIFEXITED(stat) ? WEXITSTATUS(stat) : -1; goto out; } @@ -1376,13 +1417,12 @@ static int scrub_start(int argc, char **argv, int resume) devid = di_args[i].devid; gettimeofday(&tv, NULL); sp[i].stats.t_start = tv.tv_sec; - ret = pthread_create(&t_devs[i], &t_attr, + ret = pthread_create(&t_devs[i], NULL, scrub_one_dev, &sp[i]); if (ret) { if (do_print) - fprintf(stderr, "ERROR: creating " - "scrub_one_dev[%llu] thread failed: " - "%s\n", devid, strerror(ret)); + error("creating scrub_one_dev[%llu] thread failed: %s", + devid, strerror(ret)); err = 1; goto out; } @@ -1394,11 +1434,11 @@ static int scrub_start(int argc, char **argv, int resume) spc.write_mutex = &spc_write_mutex; spc.shared_progress = sp; spc.fi = &fi_args; - ret = pthread_create(&t_prog, &t_attr, scrub_progress_cycle, &spc); + ret = pthread_create(&t_prog, NULL, scrub_progress_cycle, &spc); if (ret) { if (do_print) - fprintf(stderr, "ERROR: creating progress thread " - "failed: %s\n", strerror(ret)); + error("creating progress thread failed: %s", + strerror(ret)); err = 1; goto out; } @@ -1411,27 +1451,30 @@ static int scrub_start(int argc, char **argv, int resume) ret = pthread_join(t_devs[i], NULL); if (ret) { if (do_print) - fprintf(stderr, "ERROR: pthread_join failed " - "for scrub_one_dev[%llu]: %s\n", devid, - strerror(ret)); + error("pthread_join failed for scrub_one_dev[%llu]: %s", + devid, strerror(ret)); ++err; continue; } - if (sp[i].ret && sp[i].ioctl_errno == ENODEV) { - if (do_print) - fprintf(stderr, "WARNING: device %lld not " - "present\n", devid); - continue; - } - if (sp[i].ret && sp[i].ioctl_errno == ECANCELED) { - ++err; - } else if (sp[i].ret) { - if (do_print) - fprintf(stderr, "ERROR: scrubbing %s failed " - "for device id %lld (%s)\n", path, - devid, strerror(sp[i].ioctl_errno)); - ++err; - continue; + if (sp[i].ret) { + switch (sp[i].ioctl_errno) { + case ENODEV: + if (do_print) + warning("device %lld not present", + devid); + continue; + case ECANCELED: + ++err; + break; + default: + if (do_print) + error("scrubbing %s failed for device id %lld: ret=%d, errno=%d (%s)", + path, devid, + sp[i].ret, sp[i].ioctl_errno, + strerror(sp[i].ioctl_errno)); + ++err; + continue; + } } if (sp[i].scrub_args.progress.uncorrectable_errors > 0) e_uncorrectable++; @@ -1470,23 +1513,21 @@ static int scrub_start(int argc, char **argv, int resume) /* check for errors from the handling of the progress thread */ if (do_print && ret) { - fprintf(stderr, "ERROR: progress thread handling failed: %s\n", + error("progress thread handling failed: %s", strerror(ret)); } /* check for errors returned from the progress thread itself */ - if (do_print && terr && terr != PTHREAD_CANCELED) { - fprintf(stderr, "ERROR: recording progress " - "failed: %s\n", strerror(-PTR_ERR(terr))); - } + if (do_print && terr && terr != PTHREAD_CANCELED) + error("recording progress failed: %s", + strerror(-PTR_ERR(terr))); if (do_record) { ret = scrub_write_progress(&spc_write_mutex, fsid, sp, fi_args.num_devices); - if (ret && do_print) { - fprintf(stderr, "ERROR: failed to record the result: " - "%s\n", strerror(-ret)); - } + if (ret && do_print) + error("failed to record the result: %s", + strerror(-ret)); } scrub_handle_sigint_child(-1); @@ -1504,29 +1545,33 @@ out: } close_file_or_dir(fdmnt, dirstream); - if (nothing_to_resume) - return 2; if (err) return 1; - if (e_correctable) + if (nothing_to_resume) + return 2; + if (e_uncorrectable) { + error_on(!do_quiet, "there are uncorrectable errors"); return 3; - if (e_uncorrectable) - return 4; + } + if (e_correctable) + warning_on(!do_quiet, + "errors detected during scrubbing, corrected"); + return 0; } static const char * const cmd_scrub_start_usage[] = { "btrfs scrub start [-BdqrRf] [-c ioprio_class -n ioprio_classdata] |", - "Start a new scrub", + "Start a new scrub. If a scrub is already running, the new one fails.", "", "-B do not background", "-d stats per device (-B only)", "-q be quiet", "-r read only mode", - "-R raw print mode, print full data instead of summary" + "-R raw print mode, print full data instead of summary", "-c set ioprio class (see ionice(1) manpage)", "-n set ioprio classdata (see ionice(1) manpage)", - "-f force to skip checking whether scrub has started/resumed in userspace ", + "-f force starting new scrub even if a scrub is already running", " this is useful when scrub stats record file is damaged", NULL }; @@ -1549,15 +1594,15 @@ static int cmd_scrub_cancel(int argc, char **argv) int fdmnt = -1; DIR *dirstream = NULL; - if (check_argc_exact(argc, 2)) + clean_args_no_options(argc, argv, cmd_scrub_cancel_usage); + + if (check_argc_exact(argc - optind, 1)) usage(cmd_scrub_cancel_usage); - path = argv[1]; + path = argv[optind]; - fdmnt = open_path_or_dev_mnt(path, &dirstream); + fdmnt = open_path_or_dev_mnt(path, &dirstream, 1); if (fdmnt < 0) { - fprintf(stderr, "ERROR: could not open %s: %s\n", - path, strerror(errno)); ret = 1; goto out; } @@ -1565,7 +1610,7 @@ static int cmd_scrub_cancel(int argc, char **argv) ret = ioctl(fdmnt, BTRFS_IOC_SCRUB_CANCEL, NULL); if (ret < 0) { - fprintf(stderr, "ERROR: scrub cancel failed on %s: %s\n", path, + error("scrub cancel failed on %s: %s", path, errno == ENOTCONN ? "not running" : strerror(errno)); if (errno == ENOTCONN) ret = 2; @@ -1590,6 +1635,7 @@ static const char * const cmd_scrub_resume_usage[] = { "-d stats per device (-B only)", "-q be quiet", "-r read only mode", + "-R raw print mode, print full data instead of summary", "-c set ioprio class (see ionice(1) manpage)", "-n set ioprio classdata (see ionice(1) manpage)", NULL @@ -1620,6 +1666,7 @@ static int cmd_scrub_status(int argc, char **argv) struct sockaddr_un addr = { .sun_family = AF_UNIX, }; + int in_progress; int ret; int i; int fdmnt; @@ -1631,7 +1678,6 @@ static int cmd_scrub_status(int argc, char **argv) int err = 0; DIR *dirstream = NULL; - optind = 1; while ((c = getopt(argc, argv, "dR")) != -1) { switch (c) { case 'd': @@ -1651,22 +1697,19 @@ static int cmd_scrub_status(int argc, char **argv) path = argv[optind]; - fdmnt = open_path_or_dev_mnt(path, &dirstream); - - if (fdmnt < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", path); + fdmnt = open_path_or_dev_mnt(path, &dirstream, 1); + if (fdmnt < 0) return 1; - } ret = get_fs_info(path, &fi_args, &di_args); if (ret) { - fprintf(stderr, "ERROR: getting dev info for scrub failed: " - "%s\n", strerror(-ret)); + error("getting dev info for scrub failed: %s", + strerror(-ret)); err = 1; goto out; } if (!fi_args.num_devices) { - fprintf(stderr, "ERROR: no devices found\n"); + error("no devices found"); err = 1; goto out; } @@ -1675,9 +1718,7 @@ static int cmd_scrub_status(int argc, char **argv) fdres = socket(AF_UNIX, SOCK_STREAM, 0); if (fdres == -1) { - fprintf(stderr, "ERROR: failed to create socket to " - "receive progress information: %s\n", - strerror(errno)); + error("failed to create socket to receive progress information: %m"); err = 1; goto out; } @@ -1690,8 +1731,8 @@ static int cmd_scrub_status(int argc, char **argv) close(fdres); fdres = scrub_open_file_r(SCRUB_DATA_FILE, fsid); if (fdres < 0 && fdres != -ENOENT) { - fprintf(stderr, "WARNING: failed to open status file: " - "%s\n", strerror(-fdres)); + warning("failed to open status file: %s", + strerror(-fdres)); err = 1; goto out; } @@ -1700,9 +1741,10 @@ static int cmd_scrub_status(int argc, char **argv) if (fdres >= 0) { past_scrubs = scrub_read_file(fdres, 1); if (IS_ERR(past_scrubs)) - fprintf(stderr, "WARNING: failed to read status: %s\n", + warning("failed to read status: %s", strerror(-PTR_ERR(past_scrubs))); } + in_progress = is_scrub_running_in_kernel(fdmnt, di_args, fi_args.num_devices); printf("scrub status for %s\n", fsid); @@ -1715,6 +1757,7 @@ static int cmd_scrub_status(int argc, char **argv) NULL, NULL); continue; } + last_scrub->stats.in_progress = in_progress; print_scrub_dev(&di_args[i], &last_scrub->p, print_raw, last_scrub->stats.finished ? "history" : "status", @@ -1722,6 +1765,7 @@ static int cmd_scrub_status(int argc, char **argv) } } else { init_fs_stat(&fs_stat); + fs_stat.s.in_progress = in_progress; for (i = 0; i < fi_args.num_devices; ++i) { last_scrub = last_dev_scrub(past_scrubs, di_args[i].devid); @@ -1743,8 +1787,11 @@ out: return !!err; } +static const char scrub_cmd_group_info[] = +"verify checksums of data and metadata"; + const struct cmd_group scrub_cmd_group = { - scrub_cmd_group_usage, NULL, { + scrub_cmd_group_usage, scrub_cmd_group_info, { { "start", cmd_scrub_start, cmd_scrub_start_usage, NULL, 0 }, { "cancel", cmd_scrub_cancel, cmd_scrub_cancel_usage, NULL, 0 }, { "resume", cmd_scrub_resume, cmd_scrub_resume_usage, NULL, 0 },