mirror of
https://github.com/koverstreet/bcachefs-tools.git
synced 2025-01-23 00:07:07 +03:00
997bb216aa
This removes the implicit `-I libbcachefs` argument to $(CC), which in turn
requires a set of minor changes throughout the tools. There are two advantages
to this setup:
1) It is (arguably) easier to read, since the location of bcachefs includes
are easier to understand at a glance ("where does util.h live?")
2) It removes the need for a hack to include glibc's copy of
dirent.h explicitly via '/usr/include/dirent.h', because libbcachefs/
*also* has a dirent.h file and the compiler cannot disambiguate them.
This has some ramifications on systems where /usr/include may not
exist, such as NixOS.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
46 lines
921 B
C
46 lines
921 B
C
|
|
#include <alloca.h>
|
|
#include <errno.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/ioctl.h>
|
|
|
|
#include "libbcachefs/bcachefs_ioctl.h"
|
|
#include "cmds.h"
|
|
|
|
int cmd_assemble(int argc, char *argv[])
|
|
{
|
|
unsigned nr_devs = argc - 1;
|
|
|
|
if (argc <= 1)
|
|
die("Please supply at least one device");
|
|
|
|
struct bch_ioctl_assemble *assemble =
|
|
alloca(sizeof(*assemble) + sizeof(__u64) * nr_devs);
|
|
|
|
memset(assemble, 0, sizeof(*assemble));
|
|
assemble->nr_devs = nr_devs;
|
|
|
|
unsigned i;
|
|
for (i = 1; i < argc; i++)
|
|
assemble->devs[i] = (__u64) argv[i];
|
|
|
|
xioctl(bcachectl_open(), BCH_IOCTL_ASSEMBLE, assemble);
|
|
return 0;
|
|
}
|
|
|
|
int cmd_incremental(int argc, char *argv[])
|
|
{
|
|
if (argc != 2)
|
|
die("Please supply exactly one device");
|
|
|
|
struct bch_ioctl_incremental incremental = {
|
|
.dev = (__u64) argv[1],
|
|
};
|
|
|
|
xioctl(bcachectl_open(), BCH_IOCTL_INCREMENTAL, &incremental);
|
|
return 0;
|
|
}
|