#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;
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;
}
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