diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2014-08-05 08:32:35 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-08-05 08:32:35 -0400 |
| commit | ba3e123a228142da43902fda5f63b1cf7cd7d96d (patch) | |
| tree | 6f3aedae504f6bbb73cf36ffde4ec273233cb3b8 /src/udev/udev-builtin-btrfs.c | |
| parent | 93bc913f142b42a481ca0466ebf31228e1132cdb (diff) | |
Include missing.h in udev-builtin-btrfs.c, and move BTRFS_IOC_DEVICES_READY to missing.h
This is a combination of upstream commits
dced15575f7bf172e3c9d798c43477539525558c
7bed7f0e3b1f9596aedb64657e432e5b267adebb
by
Simon McVittie <simon.mcvittie@collabora.co.uk>
7bed7f0e3b1f9596aedb64657e432e5b267adebb
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev/udev-builtin-btrfs.c')
| -rw-r--r-- | src/udev/udev-builtin-btrfs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c index 4e80a1d1d1..49fa16559f 100644 --- a/src/udev/udev-builtin-btrfs.c +++ b/src/udev/udev-builtin-btrfs.c @@ -24,15 +24,13 @@ #include <fcntl.h> #include <errno.h> #include <sys/ioctl.h> +#ifdef HAVE_LINUX_BTRFS_H +#include <linux/btrfs.h> +#endif +#include "missing.h" #include "udev.h" -#define BTRFS_PATH_NAME_MAX 4087 -struct btrfs_ioctl_vol_args { - int64_t fd; - char name[BTRFS_PATH_NAME_MAX + 1]; -}; -#define BTRFS_IOCTL_MAGIC 0x94 #define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, struct btrfs_ioctl_vol_args) static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) { |