Update bcachefs sources to ece184f718 bcachefs: Reflink

[bcachefs-tools-debian] / cmd_fsck.c

diff --git a/cmd_fsck.c b/cmd_fsck.c
index 4e19080a699fe73de4103a49f9c9ff9c9d6f6415..ebcf70bd856e66e55e3c9a7b8751d80d973cb8f1 100644 (file)
--- a/cmd_fsck.c
+++ b/cmd_fsck.c
@@ -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,13 +23,16 @@ static void usage(void)
 int cmd_fsck(int argc, char *argv[])
 {
        struct bch_opts opts = bch2_opts_empty();
-       int opt;
+       unsigned i;
+       int opt, ret = 0;
 
        opt_set(opts, degraded, true);
+       opt_set(opts, fsck, 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':
                        opt_set(opts, fix_errors, FSCK_OPT_YES);
                        break;
@@ -44,7 +47,7 @@ int cmd_fsck(int argc, char *argv[])
                        /* force check, even if filesystem marked clean: */
                        break;
                case 'v':
-                       opt_set(opts, verbose_recovery, true);
+                       opt_set(opts, verbose, true);
                        break;
                case 'h':
                        usage();
@@ -55,10 +58,19 @@ int cmd_fsck(int argc, char *argv[])
        if (!argc)
                die("Please supply device(s) to check");
 
+       for (i = 0; i < argc; i++)
+               if (dev_mounted_rw(argv[i]))
+                       die("%s is mounted read-write - aborting", argv[i]);
+
        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_ERRORS_FIXED, &c->flags))
+               ret = 2;
+       if (test_bit(BCH_FS_ERROR, &c->flags))
+               ret = 4;
+
        bch2_fs_stop(c);
-       return 0;
+       return ret;
 }