Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

[bcachefs-tools-debian] / c_src / cmd_format.c

diff --git a/c_src/cmd_format.c b/c_src/cmd_format.c
index 45c44e3229d0f5ff50cf5b21d3bd6d1042267f1c..3d29f41322f13d9a523be56e290e949062391144 100644 (file)
--- a/c_src/cmd_format.c
+++ b/c_src/cmd_format.c
@@ -23,12 +23,13 @@
 #include "cmds.h"
 #include "libbcachefs.h"
 #include "crypto.h"
-#include "libbcachefs/darray.h"
 #include "libbcachefs/errcode.h"
 #include "libbcachefs/opts.h"
 #include "libbcachefs/super-io.h"
 #include "libbcachefs/util.h"
 
+#include "linux/darray.h"
+
 #define OPTS                                           \
 x(0,   replicas,               required_argument)      \
 x(0,   encrypted,              no_argument)            \
@@ -188,7 +189,7 @@ int cmd_format(int argc, char *argv[])
                case O_data_allowed:
                        dev_opts.data_allowed =
                                read_flag_list_or_die(optarg,
-                                       bch2_data_types, "data type");
+                                       __bch2_data_types, "data type");
                        unconsumed_dev_option = true;
                        break;
                case O_durability: