diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-08-01 15:53:07 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-03 00:28:12 -0400 |
| commit | dced15575f7bf172e3c9d798c43477539525558c (patch) | |
| tree | 2fd54bdcd17cd2338278e98be3ef40c8b8369bd8 | |
| parent | 0943f4b7b22fb676fcd9ede50f8133bf6d4a270b (diff) | |
util.h: include missing.h, for struct file_handle
This breaks udev-builtin-btrfs.c, which reinvents some of missing.h,
so use missing.h there too.
[zj: removed #include "config.h" and wrapped #include <linux/btrfs.h>
in ifdef HAVE_LINUX_BTRFS_H as discussed on the mailing list.]
| -rw-r--r-- | src/shared/util.h | 1 | ||||
| -rw-r--r-- | src/udev/udev-builtin-btrfs.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/shared/util.h b/src/shared/util.h index fd999bd942..3e89aaf17f 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -84,6 +84,7 @@ #endif #include "macro.h" +#include "missing.h" #include "time-util.h" /* What is interpreted as whitespace? */ 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) { |