diff options
| author | Yang Xu <xuyang2018.jy@fujitsu.com> | 2021-09-01 20:43:24 +0800 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2021-09-05 22:06:00 +0800 |
| commit | feee8000cb943bd596ee4ce5a5357363fe40c10b (patch) | |
| tree | e1dfb90c04fa9e0aaa690a4882cf78e45cba8a4d /configure.ac | |
| parent | e5ccb25d0129c81077e587558e5160ea58c61144 (diff) | |
configure.ac: Fix uncorrect detection because of linux/btrfs.h
On old distros, we can't detect some btrfs structs because of
undeclared 'NULL' in btrfs_err_str function. This function has been
removed after kernel commit 68598d2ea8863 ("btrfs: remove
btrfs_err_str function from uapi/linux/btrfs.h").
Fix this bug in xfstests layer by adding stddef.h because NULL is
defined in stddef.h(it is in /usr/lib/gcc*/ directory).
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 78e9d945..0b55455a 100644 --- a/configure.ac +++ b/configure.ac @@ -69,15 +69,39 @@ AC_PACKAGE_WANT_LIBBTRFSUTIL AC_HAVE_COPY_FILE_RANGE AC_CHECK_FUNCS([renameat2]) AC_CHECK_TYPES([struct mount_attr], [], [], [[#include <linux/mount.h>]]) -AC_CHECK_TYPES([struct btrfs_qgroup_limit], [], [], [[#include <linux/btrfs.h>]]) -AC_CHECK_TYPES([struct btrfs_qgroup_inherit], [], [], [[#include <linux/btrfs.h>]]) -AC_CHECK_TYPES([struct btrfs_ioctl_vol_args], [], [], [[#include <linux/btrfs.h>]]) -AC_CHECK_TYPES([struct btrfs_ioctl_vol_args_v2], [], [], [[#include <linux/btrfs.h>]]) -AC_CHECK_TYPES([struct btrfs_ioctl_ino_lookup_args], [], [], [[#include <linux/btrfs.h>]]) -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_TYPES([struct btrfs_qgroup_limit], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) +AC_CHECK_TYPES([struct btrfs_qgroup_inherit], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) +AC_CHECK_TYPES([struct btrfs_ioctl_vol_args], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) +AC_CHECK_TYPES([struct btrfs_ioctl_vol_args_v2], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) +AC_CHECK_TYPES([struct btrfs_ioctl_ino_lookup_args], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) +AC_CHECK_TYPES([struct btrfs_ioctl_ino_lookup_user_args], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) +AC_CHECK_TYPES([struct btrfs_ioctl_get_subvol_rootref_args], [], [], [[ +#include <stddef.h> +#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_CHECK_MEMBERS([struct btrfs_ioctl_vol_args_v2.subvolid], [], [], [[ +#include <stddef.h> +#include <linux/btrfs.h> +]]) AC_CONFIG_HEADER(include/config.h) AC_CONFIG_FILES([include/builddefs]) |