bcachefs.8: completely rewrite manpage with mdoc, adapting to current usages

[bcachefs-tools-debian] / cmd_fsck.c

diff --git a/cmd_fsck.c b/cmd_fsck.c
index 9b01524a01c583beb6bfa0a86037e577ffbcb574..4e19080a699fe73de4103a49f9c9ff9c9d6f6415 100644 (file)
--- a/cmd_fsck.c
+++ b/cmd_fsck.c
@@ -23,23 +23,22 @@ 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;
 
        opt_set(opts, degraded, true);
+       opt_set(opts, fix_errors, FSCK_OPT_ASK);
 
        while ((opt = getopt(argc, argv, "pynfvh")) != -1)
                switch (opt) {
                case 'p':
-                       opt_set(opts, fix_errors, FSCK_ERR_YES);
+                       opt_set(opts, fix_errors, FSCK_OPT_YES);
                        break;
                case 'y':
-                       opt_set(opts, fix_errors, FSCK_ERR_YES);
+                       opt_set(opts, fix_errors, FSCK_OPT_YES);
                        break;
                case 'n':
                        opt_set(opts, nochanges, true);
-                       opt_set(opts, fix_errors, FSCK_ERR_NO);
+                       opt_set(opts, fix_errors, FSCK_OPT_NO);
                        break;
                case 'f':
                        /* force check, even if filesystem marked clean: */
@@ -51,13 +50,14 @@ int cmd_fsck(int argc, char *argv[])
                        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)));
 
        bch2_fs_stop(c);
        return 0;