summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-05-12 00:58:08 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-05-26 16:44:39 +0000
commit8cd552203950026977e896903a912b2bbf96a4c3 (patch)
tree324eec79d0b3d1407f3f3f44cf7ef9f8aa343eaa
parentfa62ca7deae9919f66aaa21c45ba3af7e81b578f (diff)
downloadsystemd-8cd552203950026977e896903a912b2bbf96a4c3.tar.gz
WIP: Update missing.h
-rw-r--r--configure.ac2
-rw-r--r--src/shared/missing.h41
2 files changed, 40 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 48cedb5ab6..17b01e2116 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,7 +334,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
IFLA_PHYS_PORT_ID,
IFLA_BOND_AD_INFO,
IFLA_VLAN_PROTOCOL,
- IFLA_VXLAN_LOCAL6,
+ IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
IFLA_BRIDGE_VLAN_INFO,
IFLA_BRPORT_UNICAST_FLOOD,
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 8ca6f8edb6..60f04e13dc 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -360,6 +360,16 @@ struct btrfs_ioctl_clone_range_args {
__u64 src_offset, src_length;
__u64 dest_offset;
};
+
+struct btrfs_ioctl_quota_ctl_args {
+ __u64 cmd;
+ __u64 status;
+};
+
+struct btrfs_ioctl_qgroup_limit_args {
+ __u64 qgroupid;
+ struct btrfs_qgroup_limit lim;
+};
#endif
#ifndef BTRFS_IOC_DEFRAG
@@ -367,6 +377,11 @@ struct btrfs_ioctl_clone_range_args {
struct btrfs_ioctl_vol_args)
#endif
+#ifndef BTRFS_IOC_RESIZE
+#define BTRFS_IOC_RESIZE _IOW(BTRFS_IOCTL_MAGIC, 3, \
+ struct btrfs_ioctl_vol_args)
+#endif
+
#ifndef BTRFS_IOC_CLONE
#define BTRFS_IOC_CLONE _IOW(BTRFS_IOCTL_MAGIC, 9, int)
#endif
@@ -424,6 +439,16 @@ struct btrfs_ioctl_clone_range_args {
struct btrfs_ioctl_vol_args)
#endif
+#ifndef BTRFS_IOC_QUOTA_CTL
+#define BTRFS_IOC_QUOTA_CTL _IOWR(BTRFS_IOCTL_MAGIC, 40, \
+ struct btrfs_ioctl_quota_ctl_args)
+#endif
+
+#ifndef BTRFS_IOC_QGROUP_LIMIT
+#define BTRFS_IOC_QGROUP_LIMIT _IOR(BTRFS_IOCTL_MAGIC, 43, \
+ struct btrfs_ioctl_qgroup_limit_args)
+#endif
+
#ifndef BTRFS_FIRST_FREE_OBJECTID
#define BTRFS_FIRST_FREE_OBJECTID 256
#endif
@@ -464,6 +489,15 @@ struct btrfs_ioctl_clone_range_args {
#define BTRFS_SUPER_MAGIC 0x9123683E
#endif
+#ifndef BTRFS_QUOTA_CTL_ENABLE
+#define BTRFS_QUOTA_CTL_ENABLE 1
+#endif
+
+#ifndef BTRFS_QUOTA_CTL_DISABLE
+#define BTRFS_QUOTA_CTL_DISABLE 2
+#endif
+
+
#ifndef MS_MOVE
#define MS_MOVE 8192
#endif
@@ -713,7 +747,7 @@ static inline int setns(int fd, int nstype) {
#define IFLA_VLAN_MAX (__IFLA_VLAN_MAX - 1)
#endif
-#if !HAVE_DECL_IFLA_VXLAN_LOCAL6
+#if !HAVE_DECL_IFLA_VXLAN_UDP_ZERO_CSUM6_RX
#define IFLA_VXLAN_UNSPEC 0
#define IFLA_VXLAN_ID 1
#define IFLA_VXLAN_GROUP 2
@@ -732,7 +766,10 @@ static inline int setns(int fd, int nstype) {
#define IFLA_VXLAN_PORT 15
#define IFLA_VXLAN_GROUP6 16
#define IFLA_VXLAN_LOCAL6 17
-#define __IFLA_VXLAN_MAX 18
+#define IFLA_VXLAN_UDP_CSUM 18
+#define IFLA_VXLAN_UDP_ZERO_CSUM6_TX 19
+#define IFLA_VXLAN_UDP_ZERO_CSUM6_RX 20
+#define __IFLA_VXLAN_MAX 21
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
#endif