Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Oct 2021 13:47:21 GMT
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 6ba2210ee039 - main - zfs: merge openzfs/zfs@ec64fdb93 (master) into main
Message-ID:  <202110211347.19LDlLoS004709@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=6ba2210ee039f2f12878c217bcf058e9c8b26b29

commit 6ba2210ee039f2f12878c217bcf058e9c8b26b29
Merge: 01593a0ff9f1 ec64fdb93d14
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2021-10-21 11:58:45 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2021-10-21 13:06:06 +0000

    zfs: merge openzfs/zfs@ec64fdb93 (master) into main
    
    Notable upstream pull request merges:
      #12392 Avoid panic in case of pool errors and missing L2ARC
      #12448 skip snapshot in zfs_iter_mounted()
      #12516 Fix NFS and large reads on older kernels
      #12533 Fail invalid incremental recursive send gracefully
      #12569 FreeBSD: Really zero the zero page
      #12575 Reject zfs send -RI with nonexistent fromsnap
      #12602 Correct refcount_add in dmu_zfetch
      #12650 zpool should call zfs_nicestrtonum() with non-NULL handle
    
    Obtained from:  OpenZFS
    OpenZFS commit: ec64fdb93d144ab1884097cfd36e18b62a2db848

 cddl/lib/libzfs/Makefile                           |    1 -
 cddl/lib/libzfs_core/Makefile                      |    7 +-
 cddl/lib/libzutil/Makefile                         |    5 +-
 sys/contrib/openzfs/META                           |    2 +-
 sys/contrib/openzfs/cmd/arcstat/arcstat.in         |   66 +-
 sys/contrib/openzfs/cmd/vdev_id/vdev_id            |    4 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |    9 +-
 .../openzfs/cmd/zed/zed.d/statechange-notify.sh    |    5 +-
 sys/contrib/openzfs/cmd/zpool/Makefile.am          |    3 +-
 sys/contrib/openzfs/cmd/zpool/zpool_iter.c         |   50 +-
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         |   10 +-
 sys/contrib/openzfs/cmd/zpool/zpool_util.h         |    2 +-
 sys/contrib/openzfs/contrib/initramfs/hooks/zfs.in |    1 -
 sys/contrib/openzfs/contrib/initramfs/scripts/zfs  |    1 +
 sys/contrib/openzfs/include/libzfs.h               |    1 +
 sys/contrib/openzfs/include/libzfs_core.h          |    3 +
 sys/contrib/openzfs/include/libzutil.h             |   11 +-
 .../include/os/freebsd/zfs/sys/zfs_ioctl_compat.h  |    1 -
 sys/contrib/openzfs/include/sys/dmu.h              |    2 +
 sys/contrib/openzfs/include/sys/zfs_refcount.h     |    8 +
 sys/contrib/openzfs/include/sys/zio.h              |   72 +-
 sys/contrib/openzfs/lib/Makefile.am                |   39 +
 sys/contrib/openzfs/lib/libshare/os/linux/nfs.c    |   47 +-
 sys/contrib/openzfs/lib/libspl/page.c              |    1 +
 sys/contrib/openzfs/lib/libzfs/Makefile.am         |    2 +-
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          | 1893 +++++++++++++++++++-
 sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c    |    5 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_iter.c       |    7 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |   28 +-
 .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c  |    9 +-
 .../lib/libzfs/os/freebsd/libzfs_ioctl_compat.c    |  432 -----
 .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c   |    6 +
 sys/contrib/openzfs/lib/libzfs_core/Makefile.am    |   20 +-
 .../openzfs/lib/libzfs_core/libzfs_core.abi        |  946 +---------
 sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c  |   10 +-
 .../os/freebsd/libzfs_core_ioctl.c}                |    5 +-
 .../os/linux/libzfs_core_ioctl.c}                  |    4 +-
 sys/contrib/openzfs/lib/libzpool/Makefile.am       |    4 +-
 sys/contrib/openzfs/lib/libzpool/util.c            |   98 +-
 sys/contrib/openzfs/lib/libzutil/Makefile.am       |   12 +-
 .../lib/libzutil/os/freebsd/zutil_import_os.c      |    5 +
 .../lib/libzutil/os/linux/zutil_import_os.c        |   67 +-
 sys/contrib/openzfs/lib/libzutil/zutil_import.c    |   68 +
 sys/contrib/openzfs/man/man8/zfs-send.8            |    3 +
 sys/contrib/openzfs/man/man8/zfs.8                 |    2 +-
 sys/contrib/openzfs/module/Makefile.in             |    9 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c |    1 +
 sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c |   19 -
 sys/contrib/openzfs/module/zfs/arc.c               |    7 +-
 sys/contrib/openzfs/module/zfs/dmu.c               |    6 +-
 sys/contrib/openzfs/module/zfs/dmu_zfetch.c        |    3 +-
 sys/contrib/openzfs/module/zfs/dnode.c             |   75 +-
 sys/contrib/openzfs/module/zfs/refcount.c          |    8 +
 sys/contrib/openzfs/module/zfs/vdev.c              |   24 +
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |    8 +
 sys/contrib/openzfs/tests/runfiles/linux.run       |    2 +-
 sys/contrib/openzfs/tests/runfiles/sanity.run      |    2 +-
 .../openzfs/tests/test-runner/bin/zts-report.py.in |    4 +-
 .../openzfs/tests/test-runner/include/logapi.shlib |   50 +
 .../cmd/libzfs_input_check/libzfs_input_check.c    |    6 +-
 .../openzfs/tests/zfs-tests/cmd/mkbusy/Makefile.am |    2 -
 .../openzfs/tests/zfs-tests/cmd/mkbusy/mkbusy.c    |   20 +-
 .../openzfs/tests/zfs-tests/include/blkdev.shlib   |    2 +-
 .../functional/cli_root/zfs_share/Makefile.am      |    1 +
 .../cli_root/zfs_share/zfs_share_007_neg.ksh       |    2 +-
 .../cli_root/zfs_share/zfs_share_013_pos.ksh       |   80 +
 .../cli_root/zfs_unmount/zfs_unmount_nested.ksh    |    8 +-
 .../tests/functional/compression/Makefile.am       |    4 +-
 .../functional/compression/compress_zstd_bswap.ksh |   55 +
 .../functional/compression/testpool_zstd.tar.gz    |  Bin 0 -> 1286794 bytes
 .../zfs-tests/tests/functional/ctime/Makefile.am   |    2 -
 .../tests/zfs-tests/tests/functional/ctime/ctime.c |   10 +-
 .../tests/functional/deadman/deadman_sync.ksh      |    4 +-
 .../tests/functional/rsend/rsend_016_neg.ksh       |   14 +-
 .../zvol/zvol_misc/zvol_misc_common.kshlib         |   11 +-
 .../zvol/zvol_misc/zvol_misc_rename_inuse.ksh      |    4 +-
 .../zvol/zvol_misc/zvol_misc_snapdev.ksh           |    2 +-
 .../zvol/zvol_misc/zvol_misc_volmode.ksh           |   46 +-
 .../functional/zvol/zvol_misc/zvol_misc_zil.ksh    |    4 +-
 .../openzfs/tests/zfs-tests/tests/perf/perf.shlib  |    1 -
 .../tests/perf/regression/random_reads.ksh         |    1 +
 .../tests/perf/regression/random_readwrite.ksh     |    1 +
 .../perf/regression/random_readwrite_fixed.ksh     |    1 +
 .../tests/perf/regression/random_writes.ksh        |    1 +
 .../tests/perf/regression/random_writes_zil.ksh    |    3 +-
 .../tests/perf/regression/sequential_reads.ksh     |    1 +
 .../regression/sequential_reads_arc_cached.ksh     |    3 +-
 .../sequential_reads_arc_cached_clone.ksh          |    3 +-
 .../regression/sequential_reads_dbuf_cached.ksh    |    1 +
 .../tests/perf/regression/sequential_writes.ksh    |    3 +-
 sys/modules/zfs/zfs_config.h                       |   21 +-
 sys/modules/zfs/zfs_gitrev.h                       |    2 +-
 92 files changed, 2750 insertions(+), 1764 deletions(-)

diff --cc cddl/lib/libzfs/Makefile
index 6de09d1b7333,000000000000..63bfcb39d4d8
mode 100644,000000..100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@@ -1,109 -1,0 +1,108 @@@
 +# $FreeBSD$
 +
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/include
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
 +
 +PACKAGE=	runtime
 +LIB=	zfs
 +LIBADD= \
 +	avl \
 +	bsdxml \
 +	crypto \
 +	geom \
 +	m \
 +	md \
 +	nvpair \
 +	pthread \
 +	umem \
 +	util \
 +	uutil \
 +	z \
 +	zfs_core \
 +	zutil
 +
 +INCS=	libzfs.h
 +USER_C = \
 +        libzfs_changelist.c \
 +        libzfs_config.c \
 +        libzfs_crypto.c \
 +        libzfs_dataset.c \
 +        libzfs_diff.c \
 +        libzfs_import.c \
 +        libzfs_iter.c \
 +        libzfs_mount.c \
 +        libzfs_pool.c \
 +        libzfs_sendrecv.c \
 +        libzfs_status.c \
 +        libzfs_util.c
 +
 +# FreeBSD
 +USER_C += \
 +        libzfs_compat.c \
-         libzfs_ioctl_compat.c \
 +        libzfs_zmount.c
 +
 +# libshare
 +USER_C += \
 +	libshare.c \
 +	nfs.c \
 +	os/freebsd/nfs.c \
 +	os/freebsd/smb.c
 +
 +KERNEL_C = \
 +        algs/sha2/sha2.c \
 +        cityhash.c \
 +        zfeature_common.c \
 +        zfs_comutil.c \
 +        zfs_deleg.c \
 +        zfs_fletcher.c \
 +        zfs_fletcher_superscalar.c \
 +        zfs_fletcher_superscalar4.c \
 +        zfs_namecheck.c \
 +        zfs_prop.c \
 +        zpool_prop.c \
 +        zprop_common.c
 +
 +
 +ARCH_C =
 +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 +ARCH_C += 	zfs_fletcher_intel.c \
 +		zfs_fletcher_sse.c 
 +CFLAGS +=  -DHAVE_SSE2
 +.endif
 +.if ${MACHINE_ARCH} == "amd64"
 +ARCH_C +=	zfs_fletcher_avx512.c
 +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F
 +.endif
 +.if ${MACHINE_CPUARCH} == "aarch64"
 +ARCH_C +=	zfs_fletcher_aarch64_neon.c
 +.endif
 +
 +SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C)
 +
 +WARNS?=	2
 +SHLIB_MAJOR= 4
 +CSTD=	c99
 +CFLAGS+= -DIN_BASE
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare
 +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
 +CFLAGS+= -I${SRCTOP}/sys
 +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 +CFLAGS+= -DHAVE_ISSETUGID
 +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 +CFLAGS+= -DSYSCONFDIR=\"/etc\"
 +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\"
 +
 +
 +.include <bsd.lib.mk>
diff --cc cddl/lib/libzfs_core/Makefile
index 52747bfcc2d8,000000000000..abe0348f2313
mode 100644,000000..100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@@ -1,28 -1,0 +1,33 @@@
 +# $FreeBSD$
 +
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/include
++.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
++.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
 +
 +
 +LIB=	zfs_core
 +LIBADD=	nvpair
 +PACKAGE=	runtime
 +
 +INCS=	libzfs_core.h
- SRCS=	libzfs_core.c 
++SRCS=	libzfs_core.c \
++	os/freebsd/libzfs_core_ioctl.c \
++	zfs_ioctl_compat.c
 +
 +WARNS?=	2
 +CSTD=	c99
 +CFLAGS+= -DIN_BASE
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 +CFLAGS+= -I${SRCTOP}/sys
 +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 +CFLAGS+= -DHAVE_ISSETUGID
 +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 +
 +.include <bsd.lib.mk>
diff --cc cddl/lib/libzutil/Makefile
index 7aea9da14e90,000000000000..85467151a5bb
mode 100644,000000..100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@@ -1,42 -1,0 +1,41 @@@
 +# $FreeBSD$
 +
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
 +
 +LIB=	zutil
 +LIBADD=	avl tpool
 +PACKAGE=	runtime
 +
 +INCS = zutil_import.h
 +
 +SRCS = \
 +        zutil_device_path.c \
 +        zutil_import.c \
 +        zutil_import.h \
 +        zutil_nicenum.c \
 +        zutil_pool.c
 +
 +SRCS += \
-         zutil_device_path_os.c \
-         zutil_import_os.c \
-         zutil_compat.c
++	os/freebsd/zutil_device_path_os.c \
++	os/freebsd/zutil_import_os.c
 +
 +SRCS += zfs_ioctl_compat.c
 +
 +
 +WARNS?=	2
 +CSTD=	c99
 +
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 +CFLAGS+= -I${SRCTOP}/sys
 +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil
 +CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
 +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 +
 +.include <bsd.lib.mk>
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh
index 000000000000,150eddac0ebb..150eddac0ebb
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/compress_zstd_bswap.ksh
index 000000000000,9726cf0dd5a6..9726cf0dd5a6
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/compress_zstd_bswap.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/compress_zstd_bswap.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/testpool_zstd.tar.gz
index 000000000000,4096f7fcbe44..4096f7fcbe44
mode 000000,100644..100644
Binary files differ
diff --cc sys/modules/zfs/zfs_config.h
index 82f6d415f966,000000000000..8bbe141827db
mode 100644,000000..100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@@ -1,849 -1,0 +1,864 @@@
 +/*
 + * $FreeBSD$
 + */
 +
 +/* zfs_config.h.  Generated from zfs_config.h.in by configure.  */
 +/* zfs_config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* Define to 1 if translation of program messages to the user's native
 +   language is requested. */
 +/* #undef ENABLE_NLS */
 +
 +/* bio_end_io_t wants 1 arg */
 +/* #undef HAVE_1ARG_BIO_END_IO_T */
 +
 +/* lookup_bdev() wants 1 arg */
 +/* #undef HAVE_1ARG_LOOKUP_BDEV */
 +
 +/* submit_bio() wants 1 arg */
 +/* #undef HAVE_1ARG_SUBMIT_BIO */
 +
 +/* bdi_setup_and_register() wants 2 args */
 +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */
 +
 +/* vfs_getattr wants 2 args */
 +/* #undef HAVE_2ARGS_VFS_GETATTR */
 +
 +/* zlib_deflate_workspacesize() wants 2 args */
 +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */
 +
 +/* bdi_setup_and_register() wants 3 args */
 +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */
 +
 +/* vfs_getattr wants 3 args */
 +/* #undef HAVE_3ARGS_VFS_GETATTR */
 +
 +/* vfs_getattr wants 4 args */
 +/* #undef HAVE_4ARGS_VFS_GETATTR */
 +
 +/* kernel has access_ok with 'type' parameter */
 +/* #undef HAVE_ACCESS_OK_TYPE */
 +
 +/* posix_acl has refcount_t */
 +/* #undef HAVE_ACL_REFCOUNT */
 +
 +/* Define if host toolchain supports AES */
 +#define HAVE_AES 1
 +
 +#ifdef __amd64__
 +#ifndef RESCUE
 +/* Define if host toolchain supports AVX */
 +#define HAVE_AVX 1
 +#endif
 +
 +/* Define if host toolchain supports AVX2 */
 +#define HAVE_AVX2 1
 +
 +/* Define if host toolchain supports AVX512BW */
 +#define HAVE_AVX512BW 1
 +
 +/* Define if host toolchain supports AVX512CD */
 +#define HAVE_AVX512CD 1
 +
 +/* Define if host toolchain supports AVX512DQ */
 +#define HAVE_AVX512DQ 1
 +
 +/* Define if host toolchain supports AVX512ER */
 +#define HAVE_AVX512ER 1
 +
 +/* Define if host toolchain supports AVX512F */
 +#define HAVE_AVX512F 1
 +
 +/* Define if host toolchain supports AVX512IFMA */
 +#define HAVE_AVX512IFMA 1
 +
 +/* Define if host toolchain supports AVX512PF */
 +#define HAVE_AVX512PF 1
 +
 +/* Define if host toolchain supports AVX512VBMI */
 +#define HAVE_AVX512VBMI 1
 +
 +/* Define if host toolchain supports AVX512VL */
 +#define HAVE_AVX512VL 1
 +#endif
 +
 +/* bdev_check_media_change() exists */
 +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */
 +
 +/* bdev_whole() is available */
 +/* #undef HAVE_BDEV_WHOLE */
 +
 +/* bio->bi_bdev->bd_disk exists */
 +/* #undef HAVE_BIO_BDEV_DISK */
 +
 +/* bio->bi_opf is defined */
 +/* #undef HAVE_BIO_BI_OPF */
 +
 +/* bio->bi_status exists */
 +/* #undef HAVE_BIO_BI_STATUS */
 +
 +/* bio has bi_iter */
 +/* #undef HAVE_BIO_BVEC_ITER */
 +
 +/* bio_*_io_acct() available */
 +/* #undef HAVE_BIO_IO_ACCT */
 +
 +/* bio_max_segs() is implemented */
 +/* #undef HAVE_BIO_MAX_SEGS */
 +
 +/* bio_set_dev() is available */
 +/* #undef HAVE_BIO_SET_DEV */
 +
 +/* bio_set_dev() GPL-only */
 +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */
 +
 +/* bio_set_op_attrs is available */
 +/* #undef HAVE_BIO_SET_OP_ATTRS */
 +
 +/* blkdev_reread_part() exists */
 +/* #undef HAVE_BLKDEV_REREAD_PART */
 +
 +/* blkg_tryget() is available */
 +/* #undef HAVE_BLKG_TRYGET */
 +
 +/* blkg_tryget() GPL-only */
 +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */
 +
 +/* blk_alloc_disk() exists */
 +/* #undef HAVE_BLK_ALLOC_DISK */
 +
 +/* blk_alloc_queue() expects request function */
 +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */
 +
 +/* blk_alloc_queue_rh() expects request function */
 +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */
 +
 +/* blk queue backing_dev_info is dynamic */
 +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */
 +
 +/* blk_queue_flag_clear() exists */
 +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */
 +
 +/* blk_queue_flag_set() exists */
 +/* #undef HAVE_BLK_QUEUE_FLAG_SET */
 +
 +/* blk_queue_flush() is available */
 +/* #undef HAVE_BLK_QUEUE_FLUSH */
 +
 +/* blk_queue_flush() is GPL-only */
 +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */
 +
 +/* blk_queue_secdiscard() is available */
 +/* #undef HAVE_BLK_QUEUE_SECDISCARD */
 +
 +/* blk_queue_secure_erase() is available */
 +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */
 +
++/* blk_queue_update_readahead() exists */
++/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */
++
 +/* blk_queue_write_cache() exists */
 +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */
 +
 +/* blk_queue_write_cache() is GPL-only */
 +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */
 +
 +/* Define if revalidate_disk() in block_device_operations */
 +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */
 +
 +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
 +   CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYCURRENT */
 +
 +/* Define to 1 if you have the Mac OS X function
 +   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 +
 +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
 +   the CoreFoundation framework. */
 +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 +
 +/* check_disk_change() exists */
 +/* #undef HAVE_CHECK_DISK_CHANGE */
 +
 +/* clear_inode() is available */
 +/* #undef HAVE_CLEAR_INODE */
 +
 +/* dentry uses const struct dentry_operations */
 +/* #undef HAVE_CONST_DENTRY_OPERATIONS */
 +
 +/* copy_from_iter() is available */
 +/* #undef HAVE_COPY_FROM_ITER */
 +
 +/* copy_to_iter() is available */
 +/* #undef HAVE_COPY_TO_ITER */
 +
 +/* yes */
 +/* #undef HAVE_CPU_HOTPLUG */
 +
 +/* current_time() exists */
 +/* #undef HAVE_CURRENT_TIME */
 +
 +/* Define if the GNU dcgettext() function is already present or preinstalled.
 +   */
 +/* #undef HAVE_DCGETTEXT */
 +
 +/* DECLARE_EVENT_CLASS() is available */
 +/* #undef HAVE_DECLARE_EVENT_CLASS */
 +
 +/* lookup_bdev() wants dev_t arg */
 +/* #undef HAVE_DEVT_LOOKUP_BDEV */
 +
 +/* sops->dirty_inode() wants flags */
 +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */
 +
 +/* disk_*_io_acct() available */
 +/* #undef HAVE_DISK_IO_ACCT */
 +
++/* disk_update_readahead() exists */
++/* #undef HAVE_DISK_UPDATE_READAHEAD */
++
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#define HAVE_DLFCN_H 1
 +
 +/* d_make_root() is available */
 +/* #undef HAVE_D_MAKE_ROOT */
 +
 +/* d_prune_aliases() is available */
 +/* #undef HAVE_D_PRUNE_ALIASES */
 +
 +/* dops->d_revalidate() operation takes nameidata */
 +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */
 +
 +/* eops->encode_fh() wants child and parent inodes */
 +/* #undef HAVE_ENCODE_FH_WITH_INODE */
 +
 +/* sops->evict_inode() exists */
 +/* #undef HAVE_EVICT_INODE */
 +
 +/* fops->aio_fsync() exists */
 +/* #undef HAVE_FILE_AIO_FSYNC */
 +
 +/* file_dentry() is available */
 +/* #undef HAVE_FILE_DENTRY */
 +
 +/* file_inode() is available */
 +/* #undef HAVE_FILE_INODE */
 +
 +/* iops->follow_link() cookie */
 +/* #undef HAVE_FOLLOW_LINK_COOKIE */
 +
 +/* iops->follow_link() nameidata */
 +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */
 +
 +/* fops->fsync() with range */
 +/* #undef HAVE_FSYNC_RANGE */
 +
 +/* fops->fsync() without dentry */
 +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */
 +
 +/* generic_fillattr requires struct user_namespace* */
 +/* #undef HAVE_GENERIC_FILLATTR_USERNS */
 +
 +/* generic_*_io_acct() 3 arg available */
 +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */
 +
 +/* generic_*_io_acct() 4 arg available */
 +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */
 +
 +/* generic_readlink is global */
 +/* #undef HAVE_GENERIC_READLINK */
 +
 +/* generic_setxattr() exists */
 +/* #undef HAVE_GENERIC_SETXATTR */
 +
 +/* generic_write_checks() takes kiocb */
 +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */
 +
 +/* Define if the GNU gettext() function is already present or preinstalled. */
 +/* #undef HAVE_GETTEXT */
 +
++/* iops->get_acl() exists */
++/* #undef HAVE_GET_ACL */
++
++/* iops->get_acl() takes rcu */
++/* #undef HAVE_GET_ACL_RCU */
++
 +/* iops->get_link() cookie */
 +/* #undef HAVE_GET_LINK_COOKIE */
 +
 +/* iops->get_link() delayed */
 +/* #undef HAVE_GET_LINK_DELAYED */
 +
 +/* group_info->gid exists */
 +/* #undef HAVE_GROUP_INFO_GID */
 +
 +/* has_capability() is available */
 +/* #undef HAVE_HAS_CAPABILITY */
 +
 +/* Define if you have the iconv() function and it works. */
 +#define HAVE_ICONV 1
 +
 +/* yes */
 +/* #undef HAVE_INODE_LOCK_SHARED */
 +
 +/* inode_owner_or_capable() exists */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
 +
 +/* inode_owner_or_capable() takes user_ns */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAPPED */
 +
 +/* inode_set_flags() exists */
 +/* #undef HAVE_INODE_SET_FLAGS */
 +
 +/* inode_set_iversion() exists */
 +/* #undef HAVE_INODE_SET_IVERSION */
 +
 +/* inode->i_*time's are timespec64 */
 +/* #undef HAVE_INODE_TIMESPEC64_TIMES */
 +
 +/* timestamp_truncate() exists */
 +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#define HAVE_INTTYPES_H 1
 +
 +/* in_compat_syscall() is available */
 +/* #undef HAVE_IN_COMPAT_SYSCALL */
 +
 +/* iops->create() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_CREATE_USERNS */
 +
 +/* iops->mkdir() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_MKDIR_USERNS */
 +
 +/* iops->mknod() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_MKNOD_USERNS */
 +
 +/* iops->rename() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_RENAME_USERNS */
 +
 +/* iops->symlink() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_SYMLINK_USERNS */
 +
 +/* iov_iter_advance() is available */
 +/* #undef HAVE_IOV_ITER_ADVANCE */
 +
 +/* iov_iter_count() is available */
 +/* #undef HAVE_IOV_ITER_COUNT */
 +
 +/* iov_iter_fault_in_readable() is available */
 +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */
 +
 +/* iov_iter_revert() is available */
 +/* #undef HAVE_IOV_ITER_REVERT */
 +
 +/* iov_iter types are available */
 +/* #undef HAVE_IOV_ITER_TYPES */
 +
 +/* yes */
 +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */
 +
 +/* Define to 1 if you have the `issetugid' function. */
 +#define HAVE_ISSETUGID 1
 +
 +/* kernel has kernel_fpu_* functions */
 +/* #undef HAVE_KERNEL_FPU */
 +
 +/* kernel has asm/fpu/api.h */
 +/* #undef HAVE_KERNEL_FPU_API_HEADER */
 +
 +/* kernel fpu internal */
 +/* #undef HAVE_KERNEL_FPU_INTERNAL */
 +
 +/* uncached_acl_sentinel() exists */
 +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */
 +
 +/* kernel does stack verification */
 +/* #undef HAVE_KERNEL_OBJTOOL */
 +
 +/* kernel has linux/objtool.h */
 +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */
 +
 +/* kernel_read() take loff_t pointer */
 +/* #undef HAVE_KERNEL_READ_PPOS */
 +
 +/* timer_list.function gets a timer_list */
 +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */
 +
 +/* struct timer_list has a flags member */
 +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */
 +
 +/* timer_setup() is available */
 +/* #undef HAVE_KERNEL_TIMER_SETUP */
 +
 +/* kernel_write() take loff_t pointer */
 +/* #undef HAVE_KERNEL_WRITE_PPOS */
 +
 +/* kmem_cache_create_usercopy() exists */
 +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */
 +
 +/* kstrtoul() exists */
 +/* #undef HAVE_KSTRTOUL */
 +
 +/* ktime_get_coarse_real_ts64() exists */
 +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */
 +
 +/* ktime_get_raw_ts64() exists */
 +/* #undef HAVE_KTIME_GET_RAW_TS64 */
 +
 +/* kvmalloc exists */
 +/* #undef HAVE_KVMALLOC */
 +
 +/* Define if you have [aio] */
 +/* #undef HAVE_LIBAIO */
 +
 +/* Define if you have [blkid] */
 +/* #undef HAVE_LIBBLKID */
 +
 +/* Define if you have [crypto] */
 +#define HAVE_LIBCRYPTO 1
 +
 +/* Define if you have [tirpc] */
 +/* #undef HAVE_LIBTIRPC */
 +
 +/* Define if you have [udev] */
 +/* #undef HAVE_LIBUDEV */
 +
 +/* Define if you have [uuid] */
 +/* #undef HAVE_LIBUUID */
 +
 +/* lseek_execute() is available */
 +/* #undef HAVE_LSEEK_EXECUTE */
 +
 +/* makedev() is declared in sys/mkdev.h */
 +/* #undef HAVE_MAKEDEV_IN_MKDEV */
 +
 +/* makedev() is declared in sys/sysmacros.h */
 +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */
 +
 +/* Noting that make_request_fn() returns blk_qc_t */
 +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */
 +
 +/* Noting that make_request_fn() returns void */
 +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */
 +
 +/* Define to 1 if you have the <memory.h> header file. */
 +#define HAVE_MEMORY_H 1
 +
 +/* iops->mkdir() takes umode_t */
 +/* #undef HAVE_MKDIR_UMODE_T */
 +
 +/* Define to 1 if you have the `mlockall' function. */
 +#define HAVE_MLOCKALL 1
 +
 +/* lookup_bdev() wants mode arg */
 +/* #undef HAVE_MODE_LOOKUP_BDEV */
 +
 +/* Define if host toolchain supports MOVBE */
 +#define HAVE_MOVBE 1
 +
 +/* new_sync_read()/new_sync_write() are available */
 +/* #undef HAVE_NEW_SYNC_READ */
 +
 +/* iops->getattr() takes a path */
 +/* #undef HAVE_PATH_IOPS_GETATTR */
 +
 +/* Define if host toolchain supports PCLMULQDQ */
 +#define HAVE_PCLMULQDQ 1
 +
 +/* percpu_counter_add_batch() is defined */
 +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */
 +
 +/* percpu_counter_init() wants gfp_t */
 +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */
 +
 +/* posix_acl_chmod() exists */
 +/* #undef HAVE_POSIX_ACL_CHMOD */
 +
 +/* posix_acl_from_xattr() needs user_ns */
 +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */
 +
 +/* posix_acl_release() is available */
 +/* #undef HAVE_POSIX_ACL_RELEASE */
 +
 +/* posix_acl_release() is GPL-only */
 +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */
 +
 +/* posix_acl_valid() wants user namespace */
 +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */
 +
 +/* proc_ops structure exists */
 +/* #undef HAVE_PROC_OPS_STRUCT */
 +
 +/* iops->put_link() cookie */
 +/* #undef HAVE_PUT_LINK_COOKIE */
 +
 +/* iops->put_link() delayed */
 +/* #undef HAVE_PUT_LINK_DELAYED */
 +
 +/* iops->put_link() nameidata */
 +/* #undef HAVE_PUT_LINK_NAMEIDATA */
 +
 +/* If available, contains the Python version number currently in use. */
 +#define HAVE_PYTHON "3.7"
 +
 +/* qat is enabled and existed */
 +/* #undef HAVE_QAT */
 +
 +/* iops->rename() wants flags */
 +/* #undef HAVE_RENAME_WANTS_FLAGS */
 +
 +/* REQ_DISCARD is defined */
 +/* #undef HAVE_REQ_DISCARD */
 +
 +/* REQ_FLUSH is defined */
 +/* #undef HAVE_REQ_FLUSH */
 +
 +/* REQ_OP_DISCARD is defined */
 +/* #undef HAVE_REQ_OP_DISCARD */
 +
 +/* REQ_OP_FLUSH is defined */
 +/* #undef HAVE_REQ_OP_FLUSH */
 +
 +/* REQ_OP_SECURE_ERASE is defined */
 +/* #undef HAVE_REQ_OP_SECURE_ERASE */
 +
 +/* REQ_PREFLUSH is defined */
 +/* #undef HAVE_REQ_PREFLUSH */
 +
 +/* revalidate_disk() is available */
 +/* #undef HAVE_REVALIDATE_DISK */
 +
 +/* revalidate_disk_size() is available */
 +/* #undef HAVE_REVALIDATE_DISK_SIZE */
 +
 +/* struct rw_semaphore has member activity */
 +/* #undef HAVE_RWSEM_ACTIVITY */
 +
 +/* struct rw_semaphore has atomic_long_t member count */
 +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */
 +
 +/* linux/sched/signal.h exists */
 +/* #undef HAVE_SCHED_SIGNAL_HEADER */
 +
 +/* Define to 1 if you have the <security/pam_modules.h> header file. */
 +#define HAVE_SECURITY_PAM_MODULES_H 1
 +
 +/* setattr_prepare() is available, doesn't accept user_namespace */
 +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */
 +
 +/* setattr_prepare() accepts user_namespace */
 +/* #undef HAVE_SETATTR_PREPARE_USERNS */
 +
 +/* iops->set_acl() exists, takes 3 args */
 +/* #undef HAVE_SET_ACL */
 +
 +/* iops->set_acl() takes 4 args */
 +/* #undef HAVE_SET_ACL_USERNS */
 +
 +/* set_cached_acl() is usable */
 +/* #undef HAVE_SET_CACHED_ACL_USABLE */
 +
 +/* set_special_state() exists */
 +/* #undef HAVE_SET_SPECIAL_STATE */
 +
 +/* struct shrink_control exists */
 +/* #undef HAVE_SHRINK_CONTROL_STRUCT */
 +
 +/* kernel_siginfo_t exists */
 +/* #undef HAVE_SIGINFO */
 +
 +/* signal_stop() exists */
 +/* #undef HAVE_SIGNAL_STOP */
 +
 +/* new shrinker callback wants 2 args */
 +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */
 +
 +/* ->count_objects exists */
 +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */
 +
 +#if defined(__amd64__) || defined(__i386__)
 +/* Define if host toolchain supports SSE */
 +#define HAVE_SSE 1
 +
 +/* Define if host toolchain supports SSE2 */
 +#define HAVE_SSE2 1
 +
 +/* Define if host toolchain supports SSE3 */
 +#define HAVE_SSE3 1
 +
 +/* Define if host toolchain supports SSE4.1 */
 +#define HAVE_SSE4_1 1
 +
 +/* Define if host toolchain supports SSE4.2 */
 +#define HAVE_SSE4_2 1
 +
 +/* Define if host toolchain supports SSSE3 */
 +#define HAVE_SSSE3 1
 +#endif
 +
 +/* STACK_FRAME_NON_STANDARD is defined */
 +/* #undef HAVE_STACK_FRAME_NON_STANDARD */
 +
++/* standalone <linux/stdarg.h> exists */
++/* #undef HAVE_STANDALONE_LINUX_STDARG */
++
 +/* Define to 1 if you have the <stdint.h> header file. */
 +#define HAVE_STDINT_H 1
 +
 +/* Define to 1 if you have the <stdlib.h> header file. */
 +#define HAVE_STDLIB_H 1
 +
 +/* Define to 1 if you have the <strings.h> header file. */
 +#define HAVE_STRINGS_H 1
 +
 +/* Define to 1 if you have the <string.h> header file. */
 +#define HAVE_STRING_H 1
 +
 +/* Define to 1 if you have the `strlcat' function. */
 +#define HAVE_STRLCAT 1
 +
 +/* Define to 1 if you have the `strlcpy' function. */
 +#define HAVE_STRLCPY 1
 +
 +/* submit_bio is member of struct block_device_operations */
 +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */
 +
 +/* super_setup_bdi_name() exits */
 +/* #undef HAVE_SUPER_SETUP_BDI_NAME */
 +
 +/* super_block->s_user_ns exists */
 +/* #undef HAVE_SUPER_USER_NS */
 +
 +/* Define to 1 if you have the <sys/stat.h> header file. */
 +#define HAVE_SYS_STAT_H 1
 +
 +/* Define to 1 if you have the <sys/types.h> header file. */
 +#define HAVE_SYS_TYPES_H 1
 +
 +/* i_op->tmpfile() exists */
 +/* #undef HAVE_TMPFILE */
 +
*** 237 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110211347.19LDlLoS004709>