[systemd-devel] [PATCH] missing.h: add more btrfs types and defines

[David Herrmann]

Hi

On Wed, Mar 18, 2015 at 2:04 PM, Michael Olbrich
<m.olbrich at pengutronix.de> wrote:
> ---
>
> Hi,
>
> it seems we're getting a lot of btrfs stuff here. Maybe we should ship a
> copy of btrfs.h instead?

All these definitions where introduced with linux-3.8 (well, the
header was moved to linux/btrfs.h at that time). Our current
requirement is linux-3.7. I'd just say, lets require linux-headers-3.8
at build-time?

Thanks
David

> Michael
>
>  src/shared/missing.h | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 151 insertions(+)
>
> diff --git a/src/shared/missing.h b/src/shared/missing.h
> index 802b4957e0a1..ca670cea43f7 100644
> --- a/src/shared/missing.h
> +++ b/src/shared/missing.h
> @@ -230,12 +230,59 @@ static inline int getrandom(void *buffer, size_t count, unsigned flags) {
>  #define BTRFS_UUID_SIZE 16
>  #endif
>
> +#ifndef BTRFS_SUBVOL_RDONLY
> +#define BTRFS_SUBVOL_RDONLY (1ULL << 1)
> +#endif
> +
> +#ifndef BTRFS_SUBVOL_NAME_MAX
> +#define BTRFS_SUBVOL_NAME_MAX 4039
> +#endif
> +
> +#ifndef BTRFS_INO_LOOKUP_PATH_MAX
> +#define BTRFS_INO_LOOKUP_PATH_MAX 4080
> +#endif
> +
> +#ifndef BTRFS_SEARCH_ARGS_BUFSIZE
> +#define BTRFS_SEARCH_ARGS_BUFSIZE (4096 - sizeof(struct btrfs_ioctl_search_key))
> +#endif
> +
>  #ifndef HAVE_LINUX_BTRFS_H
>  struct btrfs_ioctl_vol_args {
>          int64_t fd;
>          char name[BTRFS_PATH_NAME_MAX + 1];
>  };
>
> +struct btrfs_qgroup_limit {
> +        __u64 flags;
> +        __u64 max_rfer;
> +        __u64 max_excl;
> +        __u64 rsv_rfer;
> +        __u64 rsv_excl;
> +};
> +
> +struct btrfs_qgroup_inherit {
> +        __u64 flags;
> +        __u64 num_qgroups;
> +        __u64 num_ref_copies;
> +        __u64 num_excl_copies;
> +        struct btrfs_qgroup_limit lim;
> +        __u64 qgroups[0];
> +};
> +
> +struct btrfs_ioctl_vol_args_v2 {
> +        __s64 fd;
> +        __u64 transid;
> +        __u64 flags;
> +        union {
> +                struct {
> +                        __u64 size;
> +                        struct btrfs_qgroup_inherit *qgroup_inherit;
> +                };
> +                __u64 unused[4];
> +        };
> +        char name[BTRFS_SUBVOL_NAME_MAX + 1];
> +};
> +
>  struct btrfs_ioctl_dev_info_args {
>          uint64_t devid;                         /* in/out */
>          uint8_t uuid[BTRFS_UUID_SIZE];          /* in/out */
> @@ -251,6 +298,68 @@ struct btrfs_ioctl_fs_info_args {
>          uint8_t fsid[BTRFS_FSID_SIZE];          /* out */
>          uint64_t reserved[124];                 /* pad to 1k */
>  };
> +
> +struct btrfs_ioctl_ino_lookup_args {
> +        __u64 treeid;
> +        __u64 objectid;
> +        char name[BTRFS_INO_LOOKUP_PATH_MAX];
> +};
> +
> +struct btrfs_ioctl_search_key {
> +        /* which root are we searching.  0 is the tree of tree roots */
> +        __u64 tree_id;
> +
> +        /* keys returned will be >= min and <= max */
> +        __u64 min_objectid;
> +        __u64 max_objectid;
> +
> +        /* keys returned will be >= min and <= max */
> +        __u64 min_offset;
> +        __u64 max_offset;
> +
> +        /* max and min transids to search for */
> +        __u64 min_transid;
> +        __u64 max_transid;
> +
> +        /* keys returned will be >= min and <= max */
> +        __u32 min_type;
> +        __u32 max_type;
> +
> +        /*
> +         * how many items did userland ask for, and how many are we
> +         * returning
> +         */
> +        __u32 nr_items;
> +
> +        /* align to 64 bits */
> +        __u32 unused;
> +
> +        /* some extra for later */
> +        __u64 unused1;
> +        __u64 unused2;
> +        __u64 unused3;
> +        __u64 unused4;
> +};
> +
> +struct btrfs_ioctl_search_header {
> +        __u64 transid;
> +        __u64 objectid;
> +        __u64 offset;
> +        __u32 type;
> +        __u32 len;
> +};
> +
> +
> +struct btrfs_ioctl_search_args {
> +        struct btrfs_ioctl_search_key key;
> +        char buf[BTRFS_SEARCH_ARGS_BUFSIZE];
> +};
> +
> +struct btrfs_ioctl_clone_range_args {
> +        __s64 src_fd;
> +        __u64 src_offset, src_length;
> +        __u64 dest_offset;
> +};
>  #endif
>
>  #ifndef BTRFS_IOC_DEFRAG
> @@ -258,6 +367,48 @@ struct btrfs_ioctl_fs_info_args {
>                                   struct btrfs_ioctl_vol_args)
>  #endif
>
> +#ifndef BTRFS_IOC_CLONE
> +#define BTRFS_IOC_CLONE _IOW(BTRFS_IOCTL_MAGIC, 9, int)
> +#endif
> +
> +#ifndef BTRFS_IOC_CLONE_RANGE
> +#define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \
> +                                 struct btrfs_ioctl_clone_range_args)
> +#endif
> +
> +#ifndef BTRFS_IOC_SUBVOL_CREATE
> +#define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, \
> +                                 struct btrfs_ioctl_vol_args)
> +#endif
> +
> +#ifndef BTRFS_IOC_SNAP_DESTROY
> +#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, \
> +                                 struct btrfs_ioctl_vol_args)
> +#endif
> +
> +#ifndef BTRFS_IOC_TREE_SEARCH
> +#define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, \
> +                                 struct btrfs_ioctl_search_args)
> +#endif
> +
> +#ifndef BTRFS_IOC_INO_LOOKUP
> +#define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, \
> +                                 struct btrfs_ioctl_ino_lookup_args)
> +#endif
> +
> +#ifndef BTRFS_IOC_SNAP_CREATE_V2
> +#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
> +                                 struct btrfs_ioctl_vol_args_v2)
> +#endif
> +
> +#ifndef BTRFS_IOC_SUBVOL_GETFLAGS
> +#define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, __u64)
> +#endif
> +
> +#ifndef BTRFS_IOC_SUBVOL_SETFLAGS
> +#define BTRFS_IOC_SUBVOL_SETFLAGS _IOW(BTRFS_IOCTL_MAGIC, 26, __u64)
> +#endif
> +
>  #ifndef BTRFS_IOC_DEV_INFO
>  #define BTRFS_IOC_DEV_INFO _IOWR(BTRFS_IOCTL_MAGIC, 30, \
>                                   struct btrfs_ioctl_dev_info_args)
> --
> 2.1.4
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel