Update bcachefs sources to feaca6edbd24 mean and variance: Promote to lib/math

[bcachefs-tools-debian] / cmd_fsck.c

diff --git a/cmd_fsck.c b/cmd_fsck.c
index 5ca9b8254536d39f2cb7e405e42037f9a33b8f20..f7dcae98e518917d9fa3ba5636233111fb4aa8d9 100644 (file)
--- a/cmd_fsck.c
+++ b/cmd_fsck.c
@@ -1,8 +1,9 @@
 
+#include <getopt.h>
 #include "cmds.h"
-#include "error.h"
+#include "libbcachefs/error.h"
 #include "libbcachefs.h"
-#include "super.h"
+#include "libbcachefs/super.h"
 #include "tools-util.h"
 
 static void usage(void)
@@ -11,54 +12,100 @@ static void usage(void)
             "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"
+            "  -r, --ratelimit_errors  Don't display more than 10 errors of a given type\n"
+            "  -R, --reconstruct_alloc Reconstruct the alloc btree\n"
+            "  -v                      Be verbose\n"
+            "  -h, --help              Display this help and exit\n"
+            "Report bugs to <linux-bcachefs@vger.kernel.org>");
 }
 
 int cmd_fsck(int argc, char *argv[])
 {
+       static const struct option longopts[] = {
+               { "ratelimit_errors",   no_argument,            NULL, 'r' },
+               { "reconstruct_alloc",  no_argument,            NULL, 'R' },
+               { "help",               no_argument,            NULL, 'h' },
+               { NULL }
+       };
        struct bch_opts opts = bch2_opts_empty();
-       struct bch_fs *c = NULL;
-       const char *err;
-       int opt;
+       unsigned i;
+       int opt, ret = 0;
 
-       opts.degraded = true;
+       opt_set(opts, degraded, true);
+       opt_set(opts, fsck, true);
+       opt_set(opts, fix_errors, FSCK_FIX_ask);
 
-       while ((opt = getopt(argc, argv, "pynfvh")) != -1)
+       while ((opt = getopt_long(argc, argv,
+                                 "apynfo:rvh",
+                                 longopts, NULL)) != -1)
                switch (opt) {
+               case 'a': /* outdated alias for -p */
                case 'p':
-                       opts.fix_errors = FSCK_ERR_YES;
-                       break;
                case 'y':
-                       opts.fix_errors = FSCK_ERR_YES;
+                       opt_set(opts, fix_errors, FSCK_FIX_yes);
                        break;
                case 'n':
-                       opts.nochanges = true;
-                       opts.fix_errors = FSCK_ERR_NO;
+                       opt_set(opts, nochanges, true);
+                       opt_set(opts, fix_errors, FSCK_FIX_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, ratelimit_errors, true);
+                       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 (!argc) {
+               fprintf(stderr, "Please supply device(s) to check\n");
+               exit(8);
+       }
+
+       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);
                }
+       }
 
-       if (optind >= argc)
-               die("Please supply device(s) to check");
+       struct bch_fs *c = bch2_fs_open(argv, argc, opts);
+       if (IS_ERR(c)) {
+               fprintf(stderr, "error opening %s: %s\n", argv[0], bch2_err_str(PTR_ERR(c)));
+               exit(8);
+       }
 
-       err = bch2_fs_open(argv + optind, argc - optind, opts, &c);
-       if (err)
-               die("error opening %s: %s", argv[optind], err);
+       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;
+       }
 
        bch2_fs_stop(c);
-       return 0;
+       return ret;
 }