diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-08-23 11:21:38 -0700 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2021-08-29 21:05:45 +0800 |
| commit | 90199d8061509a02d514dbdcc930928ce3fc8b1c (patch) | |
| tree | 2a79ed3f2acc8b13c70a91bbe689439ddb3560c4 | |
| parent | f4660739feddf1d4717530a83c96f44135417fe0 (diff) | |
idmap: override btrfs_ioctl_vol_args_v2 if system header doesn't have subvolid
The struct btrfs_ioctl_vol_args_v2 in /usr/include/linux/btrfs.h on
my system predates the inclusion of the "subvolid" field. This
causes the following build failure:
idmapped-mounts.c: In function 'btrfs_delete_subvolume_id':
idmapped-mounts.c:9730:6: error: 'struct btrfs_ioctl_vol_args_v2' has no member named 'subvolid'
9730 | args.subvolid = subvolid;
| ^
Since this source file contains its own more uptodate copy of that
structure, add some more autoconf/cpp magic so that we can override
the struct definition if the system header doesn't have the desired
field.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Anju T Sudhakar<anju@linux.vnet.ibm.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/idmapped-mounts/idmapped-mounts.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4f9f672a..78e9d945 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ AC_CHECK_TYPES([struct btrfs_ioctl_ino_lookup_args], [], [], [[#include <linux/b AC_CHECK_TYPES([struct btrfs_ioctl_ino_lookup_user_args], [], [], [[#include <linux/btrfs.h>]]) AC_CHECK_TYPES([struct btrfs_ioctl_get_subvol_rootref_args], [], [], [[#include <linux/btrfs.h>]]) AC_CHECK_HEADERS([linux/btrfs.h linux/btrfs_tree.h]) - +AC_CHECK_MEMBERS([struct btrfs_ioctl_vol_args_v2.subvolid], [], [], [[#include <linux/btrfs.h>]]) AC_CONFIG_HEADER(include/config.h) AC_CONFIG_FILES([include/builddefs]) diff --git a/src/idmapped-mounts/idmapped-mounts.c b/src/idmapped-mounts/idmapped-mounts.c index 78b7cc09..40eb2cc6 100644 --- a/src/idmapped-mounts/idmapped-mounts.c +++ b/src/idmapped-mounts/idmapped-mounts.c @@ -23,7 +23,11 @@ #include <unistd.h> #ifdef HAVE_LINUX_BTRFS_H +# ifndef HAVE_STRUCT_BTRFS_IOCTL_VOL_ARGS_V2_SUBVOLID +# define btrfs_ioctl_vol_args_v2 override_btrfs_ioctl_vol_args_v2 +# endif #include <linux/btrfs.h> +# undef btrfs_ioctl_vol_args_v2 #endif #ifdef HAVE_LINUX_BTRFS_TREE_H @@ -9570,7 +9574,7 @@ struct btrfs_qgroup_inherit { }; #endif -#ifndef HAVE_STRUCT_BTRFS_IOCTL_VOL_ARGS_V2 +#if !defined(HAVE_STRUCT_BTRFS_IOCTL_VOL_ARGS_V2) || !defined(HAVE_STRUCT_BTRFS_IOCTL_VOL_ARGS_V2_SUBVOLID) #ifndef BTRFS_SUBVOL_NAME_MAX #define BTRFS_SUBVOL_NAME_MAX 4039 |