Improved the show-super group and target printing

[bcachefs-tools-debian] / cmd_fsck.c

diff --git a/cmd_fsck.c b/cmd_fsck.c
index 5ca9b8254536d39f2cb7e405e42037f9a33b8f20..d16760acfd3b363b54485f973e73d183fd5d6462 100644 (file)
--- a/cmd_fsck.c
+++ b/cmd_fsck.c
@@ -1,8 +1,8 @@
 
 #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,7 +11,7 @@ static void usage(void)
             "Usage: bcachefs fsck [OPTION]... <devices>\n"
             "\n"
             "Options:\n"
-            "  -p     Automatic repair (no questions\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"
@@ -23,42 +23,48 @@ static void usage(void)
 int cmd_fsck(int argc, char *argv[])
 {
        struct bch_opts opts = bch2_opts_empty();
-       struct bch_fs *c = NULL;
-       const char *err;
-       int opt;
+       int opt, ret = 0;
 
-       opts.degraded = true;
+       opt_set(opts, degraded, true);
+       opt_set(opts, fix_errors, FSCK_OPT_ASK);
 
-       while ((opt = getopt(argc, argv, "pynfvh")) != -1)
+       while ((opt = getopt(argc, argv, "apynfvh")) != -1)
                switch (opt) {
+               case 'a': /* outdated alias for -p */
                case 'p':
-                       opts.fix_errors = FSCK_ERR_YES;
+                       opt_set(opts, fix_errors, FSCK_OPT_YES);
                        break;
                case 'y':
-                       opts.fix_errors = FSCK_ERR_YES;
+                       opt_set(opts, fix_errors, FSCK_OPT_YES);
                        break;
                case 'n':
-                       opts.nochanges = true;
-                       opts.fix_errors = 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 'v':
-                       opts.verbose_recovery = true;
+                       opt_set(opts, verbose_recovery, true);
                        break;
                case 'h':
                        usage();
                        exit(EXIT_SUCCESS);
                }
+       args_shift(optind);
 
-       if (optind >= argc)
+       if (!argc)
                die("Please supply device(s) to check");
 
-       err = bch2_fs_open(argv + optind, argc - optind, opts, &c);
-       if (err)
-               die("error opening %s: %s", argv[optind], err);
+       struct bch_fs *c = bch2_fs_open(argv, argc, opts);
+       if (IS_ERR(c))
+               die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c)));
+
+       if (test_bit(BCH_FS_FSCK_FIXED_ERRORS, &c->flags))
+               ret = 2;
+       if (test_bit(BCH_FS_FSCK_UNFIXED_ERRORS, &c->flags))
+               ret = 4;
 
        bch2_fs_stop(c);
-       return 0;
+       return ret;
 }