Update bcachefs sources to ece184f718 bcachefs: Reflink

[bcachefs-tools-debian] / cmd_fsck.c

diff --git a/cmd_fsck.c b/cmd_fsck.c
index d16760acfd3b363b54485f973e73d183fd5d6462..ebcf70bd856e66e55e3c9a7b8751d80d973cb8f1 100644 (file)
--- a/cmd_fsck.c
+++ b/cmd_fsck.c
@@ -23,9 +23,11 @@ static void usage(void)
 int cmd_fsck(int argc, char *argv[])
 {
        struct bch_opts opts = bch2_opts_empty();
+       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, "apynfvh")) != -1)
@@ -45,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();
@@ -56,13 +58,17 @@ 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_FSCK_FIXED_ERRORS, &c->flags))
+       if (test_bit(BCH_FS_ERRORS_FIXED, &c->flags))
                ret = 2;
-       if (test_bit(BCH_FS_FSCK_UNFIXED_ERRORS, &c->flags))
+       if (test_bit(BCH_FS_ERROR, &c->flags))
                ret = 4;
 
        bch2_fs_stop(c);