#include "cmds.h"
#include "libbcachefs.h"
#include "crypto.h"
-#include "opts.h"
-#include "util.h"
+#include "libbcachefs/opts.h"
+#include "libbcachefs/super-io.h"
+#include "libbcachefs/util.h"
#define OPTS \
t("bcachefs format - create a new bcachefs filesystem on one or more devices") \
x(0, metadata_checksum_type, "(none|crc32c|crc64)", NULL) \
x(0, data_checksum_type, "(none|crc32c|crc64)", NULL) \
x(0, compression_type, "(none|lz4|gzip)", NULL) \
+x(0, replicas, "#", NULL) \
x(0, data_replicas, "#", NULL) \
x(0, metadata_replicas, "#", NULL) \
x(0, encrypted, NULL, "Enable whole filesystem encryption (chacha20/poly1305)")\
x(0, no_passphrase, NULL, "Don't encrypt master encryption key")\
-x('e', error_action, "(continue|readonly|panic)", NULL) \
+x('e', error_action, "(continue|remount-ro|panic)", NULL) \
x('L', label, "label", NULL) \
x('U', uuid, "uuid", NULL) \
x('f', force, NULL, NULL) \
x(0, bucket_size, "size", "Bucket size") \
x('t', tier, "#", "Higher tier indicates slower devices")\
x(0, discard, NULL, NULL) \
+x(0, data_allowed, "journal,btree,data", "Allowed types of data on this device")\
t("Device specific options must come before corresponding devices, e.g.") \
t(" bcachefs format --tier 0 /dev/sdb --tier 1 /dev/sdc") \
t("") \
" --compression_type=(none|lz4|gzip)\n"
" --data_replicas=# Number of data replicas\n"
" --metadata_replicas=# Number of metadata replicas\n"
+ " --replicas=# Sets both data and metadata replicas\n"
" --encrypted Enable whole filesystem encryption (chacha20/poly1305)\n"
" --no_passphrase Don't encrypt master encryption key\n"
- " --error_action=(continue|readonly|panic)\n"
+ " --error_action=(continue|remount-ro|panic)\n"
" Action to take on filesystem error\n"
" -L, --label=label\n"
- " --uuid=uuid\n"
+ " -U, --uuid=uuid\n"
" -f, --force\n"
"\n"
"Device specific options:\n"
{ NULL }
};
+u64 read_flag_list_or_die(char *opt, const char * const list[],
+ const char *msg)
+{
+ u64 v = bch2_read_flag_list(opt, list);
+ if (v == (u64) -1)
+ die("Bad %s %s", msg, opt);
+
+ return v;
+}
+
int cmd_format(int argc, char *argv[])
{
darray(struct dev_opts) devices;
- struct format_opts opts = format_opts_default();
- struct dev_opts dev_opts = { 0 }, *dev;
+ struct format_opts opts = format_opts_default();
+ struct dev_opts dev_opts = dev_opts_default(), *dev;
bool force = false, no_passphrase = false, quiet = false;
int opt;
break;
case O_data_replicas:
if (kstrtouint(optarg, 10, &opts.data_replicas) ||
- dev_opts.tier >= BCH_REPLICAS_MAX)
+ opts.data_replicas >= BCH_REPLICAS_MAX)
die("invalid replicas");
break;
case O_metadata_replicas:
if (kstrtouint(optarg, 10, &opts.meta_replicas) ||
- dev_opts.tier >= BCH_REPLICAS_MAX)
+ opts.meta_replicas >= BCH_REPLICAS_MAX)
die("invalid replicas");
break;
+ case O_replicas:
+ if (kstrtouint(optarg, 10, &opts.data_replicas) ||
+ opts.data_replicas >= BCH_REPLICAS_MAX)
+ die("invalid replicas");
+ opts.meta_replicas = opts.data_replicas;
+ break;
case O_encrypted:
opts.encrypted = true;
break;
case O_discard:
dev_opts.discard = true;
break;
+ case O_data_allowed:
+ dev_opts.data_allowed =
+ read_flag_list_or_die(optarg,
+ bch2_data_types, "data type");
+ break;
case O_no_opt:
dev_opts.path = strdup(optarg);
darray_append(devices, dev_opts);
if (!darray_size(devices))
die("Please supply a device");
- if (opts.encrypted && !no_passphrase) {
- opts.passphrase = read_passphrase("Enter passphrase: ");
-
- if (isatty(STDIN_FILENO)) {
- char *pass2 =
- read_passphrase("Enter same passphrase again: ");
-
- if (strcmp(opts.passphrase, pass2)) {
- memzero_explicit(opts.passphrase,
- strlen(opts.passphrase));
- memzero_explicit(pass2, strlen(pass2));
- die("Passphrases do not match");
- }
-
- memzero_explicit(pass2, strlen(pass2));
- free(pass2);
- }
- }
+ if (opts.encrypted && !no_passphrase)
+ opts.passphrase = read_passphrase_twice("Enter passphrase: ");
darray_foreach(dev, devices)
dev->fd = open_for_format(dev->path, force);
bch2_format(opts, devices.item, darray_size(devices));
if (!quiet)
- bch2_super_print(sb, HUMAN_READABLE);
+ bch2_sb_print(sb, false, 1 << BCH_SB_FIELD_members, HUMAN_READABLE);
free(sb);
if (opts.passphrase) {
return 0;
}
+static void show_super_usage(void)
+{
+ puts("bcachefs show-super \n"
+ "Usage: bcachefs show-super [OPTION].. device\n"
+ "\n"
+ "Options:\n"
+ " -f, --fields=(fields) list of sections to print\n"
+ " -l, --layout print superblock layout\n"
+ " -h, --help display this help and exit\n"
+ "Report bugs to <linux-bcache@vger.kernel.org>");
+ exit(EXIT_SUCCESS);
+}
+
int cmd_show_super(int argc, char *argv[])
{
- struct bch_sb *sb;
+ static const struct option longopts[] = {
+ { "fields", 1, NULL, 'f' },
+ { "layout", 0, NULL, 'l' },
+ { "help", 0, NULL, 'h' },
+ { NULL }
+ };
+ unsigned fields = 1 << BCH_SB_FIELD_members;
+ bool print_layout = false;
+ int opt;
+
+ while ((opt = getopt_long(argc, argv, "f:lh", longopts, NULL)) != -1)
+ switch (opt) {
+ case 'f':
+ fields = !strcmp(optarg, "all")
+ ? ~0
+ : read_flag_list_or_die(optarg,
+ bch2_sb_fields, "superblock field");
+ break;
+ case 'l':
+ print_layout = true;
+ break;
+ case 'h':
+ show_super_usage();
+ break;
+ }
+ args_shift(optind);
+
+ char *dev = arg_pop();
+ if (!dev)
+ die("please supply a device");
+ if (argc)
+ die("too many arguments");
+
+ struct bch_opts opts = bch2_opts_empty();
+
+ opt_set(opts, noexcl, true);
+ opt_set(opts, nochanges, true);
- if (argc != 2)
- die("please supply a single device");
+ struct bch_sb_handle sb;
+ int ret = bch2_read_super(dev, &opts, &sb);
+ if (ret)
+ die("Error opening %s: %s", dev, strerror(-ret));
- sb = bch2_super_read(argv[1]);
- bch2_super_print(sb, HUMAN_READABLE);
+ bch2_sb_print(sb.sb, print_layout, fields, HUMAN_READABLE);
+ bch2_free_super(&sb);
return 0;
}
projects / bcachefs-tools-debian / blobdiff