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

[bcachefs-tools-debian] / cmd_assemble.c

diff --git a/cmd_assemble.c b/cmd_assemble.c
index 735b368aa9043f8b43ebefc0c76c9dbba84c4284..a997e1e1e900f6c00824791b0c321c738558cd86 100644 (file)
--- a/cmd_assemble.c
+++ b/cmd_assemble.c
@@ -7,9 +7,11 @@
 #include <string.h>
 #include <sys/ioctl.h>
 
-#include "bcachefs_ioctl.h"
+#include "libbcachefs/bcachefs_ioctl.h"
 #include "cmds.h"
+#include "libbcachefs.h"
 
+#if 0
 int cmd_assemble(int argc, char *argv[])
 {
        unsigned nr_devs = argc - 1;
@@ -23,8 +25,9 @@ int cmd_assemble(int argc, char *argv[])
        memset(assemble, 0, sizeof(*assemble));
        assemble->nr_devs = nr_devs;
 
-       for (unsigned i = 1; i < argc; i++)
-            assemble->devs[i] = (__u64) argv[i];
+       unsigned i;
+       for (i = 0; i < nr_devs; i++)
+               assemble->devs[i] = (unsigned long) argv[i + 1];
 
        xioctl(bcachectl_open(), BCH_IOCTL_ASSEMBLE, assemble);
        return 0;
@@ -36,9 +39,10 @@ int cmd_incremental(int argc, char *argv[])
                die("Please supply exactly one device");
 
        struct bch_ioctl_incremental incremental = {
-               .dev = (__u64) argv[1],
+               .dev = (unsigned long) argv[1],
        };
 
        xioctl(bcachectl_open(), BCH_IOCTL_INCREMENTAL, &incremental);
        return 0;
 }
+#endif