X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmd_assemble.c;h=a997e1e1e900f6c00824791b0c321c738558cd86;hb=5ed0dcc00100c2f361e917760bd114a7af12394a;hp=1fa33e4cd1856478c31ba2a32aba61d3d4d8687e;hpb=5933f9478cc21e8b319309d2794948050d09b031;p=bcachefs-tools-debian

diff --git a/cmd_assemble.c b/cmd_assemble.c
index 1fa33e4..a997e1e 100644
--- a/cmd_assemble.c
+++ b/cmd_assemble.c
@@ -7,9 +7,11 @@
 #include <string.h>
 #include <sys/ioctl.h>
 
+#include "libbcachefs/bcachefs_ioctl.h"
 #include "cmds.h"
-#include "linux/bcache-ioctl.h"
+#include "libbcachefs.h"
 
+#if 0
 int cmd_assemble(int argc, char *argv[])
 {
 	unsigned nr_devs = argc - 1;
@@ -23,13 +25,11 @@ 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];
-
-	int ret = ioctl(bcachectl_open(), BCH_IOCTL_ASSEMBLE, assemble);
-	if (ret < 0)
-		die("BCH_IOCTL_ASSEMBLE error: %s", strerror(errno));
+	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;
 }
 
@@ -39,12 +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],
 	};
 
-	int ret = ioctl(bcachectl_open(), BCH_IOCTL_INCREMENTAL, &incremental);
-	if (ret < 0)
-		die("BCH_IOCTL_INCREMENTAL error: %s", strerror(errno));
-
+	xioctl(bcachectl_open(), BCH_IOCTL_INCREMENTAL, &incremental);
 	return 0;
 }
+#endif