cmd_device: add missing short options to usage

[bcachefs-tools-debian] / cmd_format.c

diff --git a/cmd_format.c b/cmd_format.c
index b6889ac1360b18001e03537d9ed87c91948a5f1a..75efd5215757223e8ff674bc19378549f0fac251 100644 (file)
--- a/cmd_format.c
+++ b/cmd_format.c
@@ -30,16 +30,20 @@
 
 #define OPTS                                                                   \
 t("bcachefs format - create a new bcachefs filesystem on one or more devices") \
-t("Usage: bcachefs format [OPTION]... <devices>")                                      \
+t("Usage: bcachefs format [OPTION]... <devices>")                              \
 t("")                                                                          \
 x('b', block_size,             "size",                 NULL)                   \
 x(0,   btree_node_size,        "size",                 "Default 256k")         \
 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,   background_compression_type,    "(none|lz4|gzip)",      NULL)           \
 x(0,   replicas,               "#",                    NULL)                   \
 x(0,   data_replicas,          "#",                    NULL)                   \
 x(0,   metadata_replicas,      "#",                    NULL)                   \
+x(0,   foreground_target,      "target",               NULL)                   \
+x(0,   background_target,      "target",               NULL)                   \
+x(0,   promote_target,         "target",               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|remount-ro|panic)", NULL)            \
@@ -50,11 +54,12 @@ t("")                                                                               \
 t("Device specific options:")                                                  \
 x(0,   fs_size,                "size",                 "Size of filesystem on device")\
 x(0,   bucket_size,            "size",                 "Bucket size")          \
-x('t', tier,                   "#",                    "Higher tier indicates slower devices")\
+x('g', group,                  "label",                "Disk group")\
 x(0,   discard,                NULL,                   NULL)                   \
 x(0,   data_allowed,           "journal,btree,data",   "Allowed types of data on this device")\
+x(0,   durability,             "#",                    "Number of times data written to this device will have been considered replicated")\
 t("Device specific options must come before corresponding devices, e.g.")      \
-t("  bcachefs format --tier 0 /dev/sdb --tier 1 /dev/sdc")                     \
+t("  bcachefs format --group cache /dev/sdb --tier 1 /dev/sdc")                        \
 t("")                                                                          \
 x('q', quiet,                  NULL,                   "Only print errors")    \
 x('h', help,                   NULL,                   "Display this help and exit")
@@ -75,7 +80,8 @@ static void usage(void)
             "      --btree_node=size       Btree node size, default 256k\n"
             "      --metadata_checksum_type=(none|crc32c|crc64)\n"
             "      --data_checksum_type=(none|crc32c|crc64)\n"
-            "      --compression_type=(none|lz4|gzip)\n"
+            "      --compression_type=(none|lz4|gzip|zstd)\n"
+            "      --background_compression_type=(none|lz4|gzip|zstd)\n"
             "      --data_replicas=#       Number of data replicas\n"
             "      --metadata_replicas=#   Number of metadata replicas\n"
             "      --replicas=#            Sets both data and metadata replicas\n"
@@ -91,13 +97,14 @@ static void usage(void)
             "      --fs_size=size          Size of filesystem on device\n"
             "      --bucket=size           Bucket size\n"
             "      --discard               Enable discards\n"
-            "  -t, --tier=#                Higher tier (e.g. 1) indicates slower devices\n"
+            "      --durability=#          Device durability (0-4)\n"
+            "  -g, --group=label           Disk group\n"
             "\n"
             "  -q, --quiet                 Only print errors\n"
             "  -h, --help                  Display this help and exit\n"
             "\n"
             "Device specific options must come before corresponding devices, e.g.\n"
-            "  bcachefs format --tier 0 /dev/sdb --tier 1 /dev/sdc\n"
+            "  bcachefs format --group cache /dev/sdb --tier 1 /dev/sdc\n"
             "\n"
             "Report bugs to <linux-bcache@vger.kernel.org>");
 }
@@ -175,22 +182,40 @@ int cmd_format(int argc, char *argv[])
                                                bch2_compression_types,
                                                "compression type");
                        break;
+               case O_background_compression_type:
+                       opts.background_compression_type =
+                               read_string_list_or_die(optarg,
+                                               bch2_compression_types,
+                                               "compression type");
+                       break;
                case O_data_replicas:
                        if (kstrtouint(optarg, 10, &opts.data_replicas) ||
-                           opts.data_replicas >= BCH_REPLICAS_MAX)
+                           !opts.data_replicas ||
+                           opts.data_replicas > BCH_REPLICAS_MAX)
                                die("invalid replicas");
                        break;
                case O_metadata_replicas:
                        if (kstrtouint(optarg, 10, &opts.meta_replicas) ||
-                           opts.meta_replicas >= BCH_REPLICAS_MAX)
+                           !opts.meta_replicas ||
+                           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)
+                           !opts.data_replicas ||
+                           opts.data_replicas > BCH_REPLICAS_MAX)
                                die("invalid replicas");
                        opts.meta_replicas = opts.data_replicas;
                        break;
+               case O_foreground_target:
+                       opts.foreground_target = strdup(optarg);
+                       break;
+               case O_background_target:
+                       opts.background_target = strdup(optarg);
+                       break;
+               case O_promote_target:
+                       opts.promote_target = strdup(optarg);
+                       break;
                case O_encrypted:
                        opts.encrypted = true;
                        break;
@@ -226,11 +251,9 @@ int cmd_format(int argc, char *argv[])
                        dev_opts.bucket_size =
                                hatoi_validate(optarg, "bucket size");
                        break;
-               case O_tier:
-               case 't':
-                       if (kstrtouint(optarg, 10, &dev_opts.tier) ||
-                           dev_opts.tier >= BCH_TIER_MAX)
-                               die("invalid tier");
+               case O_group:
+               case 'g':
+                       dev_opts.group = strdup(optarg);
                        break;
                case O_discard:
                        dev_opts.discard = true;
@@ -240,6 +263,11 @@ int cmd_format(int argc, char *argv[])
                                read_flag_list_or_die(optarg,
                                        bch2_data_types, "data type");
                        break;
+               case O_durability:
+                       if (kstrtouint(optarg, 10, &dev_opts.durability) ||
+                           dev_opts.durability > BCH_REPLICAS_MAX)
+                               die("invalid durability");
+                       break;
                case O_no_opt:
                        dev_opts.path = strdup(optarg);
                        darray_append(devices, dev_opts);