diff options
| author | Michael Marineau <michael.marineau@coreos.com> | 2013-08-15 11:50:57 -0400 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-08-16 23:29:41 +0200 |
| commit | 4b357e15876b730343db08719c877fdb45b6ad42 (patch) | |
| tree | d57bcade64dd606ff28974274d4878bb6276069b /src | |
| parent | d0a2d726f0b6a02077c178d446f89839be474d41 (diff) | |
build-sys: Add configure check for linux/btrfs.h
btrfs.h was added to uapi in Linux 3.9. To fix building with older
header versions this adds a configure check for the header and re-adds
btrfs definitions to missing.h which was removed in bed2e820 along with
two other ioctls used by gpt-auto-generator.
[ Apparently, btrfs.h was only added recently:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=55e301fd57a6239ec14b91a1cf2e70b3dd135194
let's re-add it for now -- kay ]
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 5 | ||||
| -rw-r--r-- | src/readahead/readahead-collect.c | 5 | ||||
| -rw-r--r-- | src/shared/missing.h | 57 |
3 files changed, 65 insertions, 2 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 81d692c513..a26655f096 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -22,11 +22,14 @@ #include <unistd.h> #include <stdlib.h> #include <fcntl.h> -#include <linux/btrfs.h> #include <sys/ioctl.h> #include <sys/statfs.h> #include <blkid.h> +#ifdef HAVE_LINUX_BTRFS_H +#include <linux/btrfs.h> +#endif + #include "path-util.h" #include "util.h" #include "mkdir.h" diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c index 658c230d65..5d37bb75f3 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -38,13 +38,16 @@ #include <sys/mman.h> #include <linux/fs.h> #include <linux/fiemap.h> -#include <linux/btrfs.h> #include <sys/ioctl.h> #include <sys/vfs.h> #include <getopt.h> #include <sys/inotify.h> #include <math.h> +#ifdef HAVE_LINUX_BTRFS_H +#include <linux/btrfs.h> +#endif + #ifdef HAVE_FANOTIFY_INIT #include <sys/fanotify.h> #endif diff --git a/src/shared/missing.h b/src/shared/missing.h index 6e4b398fcb..d1ca135c55 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -154,6 +154,63 @@ static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t ma } #endif +#ifndef BTRFS_IOCTL_MAGIC +#define BTRFS_IOCTL_MAGIC 0x94 +#endif + +#ifndef BTRFS_PATH_NAME_MAX +#define BTRFS_PATH_NAME_MAX 4087 +#endif + +#ifndef BTRFS_DEVICE_PATH_NAME_MAX +#define BTRFS_DEVICE_PATH_NAME_MAX 1024 +#endif + +#ifndef BTRFS_FSID_SIZE +#define BTRFS_FSID_SIZE 16 +#endif + +#ifndef BTRFS_UUID_SIZE +#define BTRFS_UUID_SIZE 16 +#endif + +#ifndef HAVE_LINUX_BTRFS_H +struct btrfs_ioctl_vol_args { + int64_t fd; + char name[BTRFS_PATH_NAME_MAX + 1]; +}; + +struct btrfs_ioctl_dev_info_args { + uint64_t devid; /* in/out */ + uint8_t uuid[BTRFS_UUID_SIZE]; /* in/out */ + uint64_t bytes_used; /* out */ + uint64_t total_bytes; /* out */ + uint64_t unused[379]; /* pad to 4k */ + char path[BTRFS_DEVICE_PATH_NAME_MAX]; /* out */ +}; + +struct btrfs_ioctl_fs_info_args { + uint64_t max_id; /* out */ + uint64_t num_devices; /* out */ + uint8_t fsid[BTRFS_FSID_SIZE]; /* out */ + uint64_t reserved[124]; /* pad to 1k */ +}; +#endif + +#ifndef BTRFS_IOC_DEFRAG +#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, struct btrfs_ioctl_vol_args) +#endif + +#ifndef BTRFS_IOC_DEV_INFO +#define BTRFS_IOC_DEV_INFO _IOWR(BTRFS_IOCTL_MAGIC, 30, \ + struct btrfs_ioctl_dev_info_args) +#endif + +#ifndef BTRFS_IOC_FS_INFO +#define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, \ + struct btrfs_ioctl_fs_info_args) +#endif + #ifndef BTRFS_SUPER_MAGIC #define BTRFS_SUPER_MAGIC 0x9123683E #endif |