+#include <getopt.h>
#include "cmds.h"
-#include "libbcache.h"
-#include "super.h"
+#include "libbcachefs/error.h"
+#include "libbcachefs.h"
+#include "libbcachefs/super.h"
#include "tools-util.h"
static void usage(void)
{
- puts("bcache fsck - filesystem check and repair\n"
- "Usage: bcache fsck [OPTION]... <devices>\n"
+ puts("bcachefs fsck - filesystem check and repair\n"
+ "Usage: bcachefs fsck [OPTION]... <devices>\n"
"\n"
"Options:\n"
- " -p Automatic repair (no questions\n"
- " -n Don't repair, only check for errors\n"
- " -y Assume \"yes\" to all questions\n"
- " -f Force checking even if filesystem is marked clean\n"
- " -v Be verbose\n"
- " --h Display this help and exit\n"
- "Report bugs to <linux-bcache@vger.kernel.org>");
+ " -p Automatic repair (no questions)\n"
+ " -n Don't repair, only check for errors\n"
+ " -y Assume \"yes\" to all questions\n"
+ " -f Force checking even if filesystem is marked clean\n"
+ " --reconstruct_alloc Reconstruct the alloc btree\n"
+ " -v Be verbose\n"
+ " -h Display this help and exit\n"
+ "Report bugs to <linux-bcachefs@vger.kernel.org>");
}
int cmd_fsck(int argc, char *argv[])
{
- DECLARE_COMPLETION_ONSTACK(shutdown);
- struct cache_set_opts opts = cache_set_opts_empty();
- struct cache_set *c = NULL;
- const char *err;
- int opt;
+ static const struct option longopts[] = {
+ { "reconstruct_alloc", no_argument, NULL, 'R' },
+ { NULL }
+ };
+ struct bch_opts opts = bch2_opts_empty();
+ unsigned i;
+ int opt, ret = 0;
- while ((opt = getopt(argc, argv, "pynfvh")) != -1)
+ opt_set(opts, degraded, true);
+ opt_set(opts, fsck, true);
+ opt_set(opts, fix_errors, FSCK_OPT_ASK);
+
+ while ((opt = getopt_long(argc, argv,
+ "apynfo:vh",
+ longopts, NULL)) != -1)
switch (opt) {
+ case 'a': /* outdated alias for -p */
case 'p':
- fsck_err_opt = FSCK_ERR_YES;
+ opt_set(opts, fix_errors, FSCK_OPT_YES);
break;
case 'y':
- fsck_err_opt = FSCK_ERR_YES;
+ opt_set(opts, fix_errors, FSCK_OPT_YES);
break;
case 'n':
- opts.nochanges = true;
- fsck_err_opt = FSCK_ERR_NO;
+ opt_set(opts, nochanges, true);
+ opt_set(opts, fix_errors, FSCK_OPT_NO);
break;
case 'f':
/* force check, even if filesystem marked clean: */
break;
+ case 'o':
+ ret = bch2_parse_mount_opts(NULL, &opts, optarg);
+ if (ret)
+ return ret;
+ break;
+ case 'R':
+ opt_set(opts, reconstruct_alloc, true);
+ break;
case 'v':
- opts.verbose_recovery = true;
+ opt_set(opts, verbose, true);
break;
case 'h':
usage();
- exit(EXIT_SUCCESS);
+ exit(16);
}
+ args_shift(optind);
- if (optind >= argc)
- die("Please supply device(s) to check");
+ if (!argc) {
+ fprintf(stderr, "Please supply device(s) to check\n");
+ exit(8);
+ }
- err = bch_register_cache_set(argv + optind, argc - optind, opts, &c);
- if (err)
- die("error opening %s: %s", argv[optind], err);
+ for (i = 0; i < argc; i++) {
+ switch (dev_mounted(argv[i])) {
+ case 1:
+ ret |= 2;
+ break;
+ case 2:
+ fprintf(stderr, "%s is mounted read-write - aborting\n", argv[i]);
+ exit(8);
+ }
+ }
- c->stop_completion = &shutdown;
- bch_cache_set_stop(c);
- closure_put(&c->cl);
+ struct bch_fs *c = bch2_fs_open(argv, argc, opts);
+ if (IS_ERR(c)) {
+ fprintf(stderr, "error opening %s: %s\n", argv[0], strerror(-PTR_ERR(c)));
+ exit(8);
+ }
- /* Killable? */
- wait_for_completion(&shutdown);
+ if (test_bit(BCH_FS_ERRORS_FIXED, &c->flags)) {
+ fprintf(stderr, "%s: errors fixed\n", c->name);
+ ret |= 1;
+ }
+ if (test_bit(BCH_FS_ERROR, &c->flags)) {
+ fprintf(stderr, "%s: still has errors\n", c->name);
+ ret |= 4;
+ }
- return 0;
+ bch2_fs_stop(c);
+ return ret;
}