Only run pkg-config once in Makefile, added EXTRA linker vars

[bcachefs-tools-debian] / cmd_device.c

diff --git a/cmd_device.c b/cmd_device.c
index 6ecd0e607e3a1b3c467a43bb15188d567832d22e..797b958c0bb32a8fe8f45cde0ed9694f9c77d5d6 100644 (file)
--- a/cmd_device.c
+++ b/cmd_device.c
@@ -28,7 +28,7 @@ static void device_add_usage(void)
             "  -S, --fs_size=size          Size of filesystem on device\n"
             "  -B, --bucket=size           Bucket size\n"
             "  -D, --discard               Enable discards\n"
-            "  -t, --tier=#                Higher tier (e.g. 1) indicates slower devices\n"
+            "  -g, --group=group           Disk group\n"
             "  -f, --force                 Use device even if it appears to already be formatted\n"
             "  -h, --help                  Display this help and exit\n"
             "\n"
@@ -95,12 +95,20 @@ int cmd_device_add(int argc, char *argv[])
        dev_opts.path = dev_path;
        dev_opts.fd = open_for_format(dev_opts.path, force);
 
-       format_opts.block_size  =
-               read_file_u64(fs.sysfs_fd, "block_size") >> 9;
-       format_opts.btree_node_size =
-               read_file_u64(fs.sysfs_fd, "btree_node_size") >> 9;
+       struct bch_opt_strs fs_opt_strs;
+       memset(&fs_opt_strs, 0, sizeof(fs_opt_strs));
 
-       struct bch_sb *sb = bch2_format(format_opts, &dev_opts, 1);
+       struct bch_opts fs_opts = bch2_parse_opts(fs_opt_strs);
+
+       opt_set(fs_opts, block_size,
+               read_file_u64(fs.sysfs_fd, "block_size") >> 9);
+       opt_set(fs_opts, btree_node_size,
+               read_file_u64(fs.sysfs_fd, "btree_node_size") >> 9);
+
+       struct bch_sb *sb = bch2_format(fs_opt_strs,
+                                       fs_opts,
+                                       format_opts,
+                                       &dev_opts, 1);
        free(sb);
        fsync(dev_opts.fd);
        close(dev_opts.fd);