X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmd_fsck.c;h=247e2072ab67c73551e9ca87e2ae77f779f0798a;hb=1388212eb85c1a904e7dcde539ebb0c2d125fcc9;hp=17750675ffe5dbb8a2b6270ee304f1f4ec67a7e0;hpb=c0ad33c126300a51721a4f0ec8c0d757647e9cbe;p=bcachefs-tools-debian

diff --git a/cmd_fsck.c b/cmd_fsck.c
index 1775067..247e207 100644
--- 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,52 +12,96 @@ 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"
+	     " --reconstruct_alloc     Reconstruct the alloc btree\n"
+	     "  -v                     Be verbose\n"
+	     "  -h                     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[] = {
+		{ "reconstruct_alloc",	no_argument,		NULL, 'R' },
+		{ NULL }
+	};
 	struct bch_opts opts = bch2_opts_empty();
-	struct bch_fs *c = NULL;
-	const char *err;
-	int opt;
+	unsigned i;
+	int opt, ret = 0;
 
-	while ((opt = getopt(argc, argv, "pynfvh")) != -1)
+	opt_set(opts, degraded, true);
+	opt_set(opts, fsck, true);
+	opt_set(opts, fix_errors, FSCK_OPT_ASK);
+
+	while ((opt = getopt_long(argc, argv,
+				  "apynfo:vh",
+				  longopts, NULL)) != -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 'o':
+			ret = bch2_parse_mount_opts(NULL, &opts, optarg);
+			if (ret)
+				return ret;
+			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], strerror(-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;
 }