packaging: Update RPM spec to use %_libexecdir for libexec files

[bcachefs-tools-debian] / cmd_format.c

diff --git a/cmd_format.c b/cmd_format.c
index 42f3fc6ca4ac822422906a1505a20ff7c6a571ce..2c470408b17251ba17864d32c3aabd75a889a49e 100644 (file)
--- a/cmd_format.c
+++ b/cmd_format.c
@@ -117,8 +117,9 @@ int cmd_format(int argc, char *argv[])
        DARRAY(struct dev_opts) devices = { 0 };
        DARRAY(char *) device_paths = { 0 };
        struct format_opts opts = format_opts_default();
-       struct dev_opts dev_opts = dev_opts_default(), *dev;
+       struct dev_opts dev_opts = dev_opts_default();
        bool force = false, no_passphrase = false, quiet = false, initialize = true, verbose = false;
+       bool unconsumed_dev_option = false;
        unsigned v;
        int opt;
 
@@ -162,6 +163,7 @@ int cmd_format(int argc, char *argv[])
                case O_fs_size:
                        if (bch2_strtoull_h(optarg, &dev_opts.size))
                                die("invalid filesystem size");
+                       unconsumed_dev_option = true;
                        break;
                case O_superblock_size:
                        if (bch2_strtouint_h(optarg, &opts.superblock_size))
@@ -172,23 +174,28 @@ int cmd_format(int argc, char *argv[])
                case O_bucket_size:
                        if (bch2_strtoull_h(optarg, &dev_opts.bucket_size))
                                die("bad bucket_size %s", optarg);
+                       unconsumed_dev_option = true;
                        break;
                case O_label:
                case 'l':
                        dev_opts.label = optarg;
+                       unconsumed_dev_option = true;
                        break;
                case O_discard:
                        dev_opts.discard = true;
+                       unconsumed_dev_option = true;
                        break;
                case O_data_allowed:
                        dev_opts.data_allowed =
                                read_flag_list_or_die(optarg,
                                        bch2_data_types, "data type");
+                       unconsumed_dev_option = true;
                        break;
                case O_durability:
                        if (kstrtouint(optarg, 10, &dev_opts.durability) ||
                            dev_opts.durability > BCH_REPLICAS_MAX)
                                die("invalid durability");
+                       unconsumed_dev_option = true;
                        break;
                case O_version:
                        if (kstrtouint(optarg, 10, &opts.version))
@@ -202,6 +209,7 @@ int cmd_format(int argc, char *argv[])
                        dev_opts.path = optarg;
                        darray_push(&devices, dev_opts);
                        dev_opts.size = 0;
+                       unconsumed_dev_option = false;
                        break;
                case O_quiet:
                case 'q':
@@ -219,6 +227,9 @@ int cmd_format(int argc, char *argv[])
                        break;
                }
 
+       if (unconsumed_dev_option)
+               die("Options for devices apply to subsequent devices; got a device option with no device");
+
        if (opts.version != bcachefs_metadata_version_current)
                initialize = false;
 
@@ -347,10 +358,12 @@ int cmd_show_super(int argc, char *argv[])
        if (ret)
                die("Error opening %s: %s", dev, bch2_err_str(ret));
 
-       if (print_default_fields)
-               fields = bch2_sb_get_members_v2(sb.sb)
+       if (print_default_fields) {
+               fields |= bch2_sb_field_get(sb.sb, members_v2)
                        ? 1 << BCH_SB_FIELD_members_v2
                        : 1 << BCH_SB_FIELD_members_v1;
+               fields |= BCH_SB_FIELD_errors;
+       }
 
        struct printbuf buf = PRINTBUF;