Date: Fri, 31 May 2024 16:16:29 -0400 From: Warner Losh <imp@bsdimp.com> To: Martin Matuska <mm@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: aca928a50a42 - main - zfs: merge openzfs/zfs@e2357561b Message-ID: <CANCZdfpF8uGn5A-S3ebYJ7f9hVq5aibJ750515iqZCta6oe9oQ@mail.gmail.com> In-Reply-To: <202405311301.44VD1UhH004254@gitrepo.freebsd.org> References: <202405311301.44VD1UhH004254@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000006990d20619c5a9d5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This seems to break macos bootstrap: % ./tools/build/make.py TARGET=3Darm64 TARGET_ARCH=3Daarch64 -DNOCLEAN buildworld -j 20 ... --- assert.o --- /Users/imp/git/head/sys/contrib/openzfs/lib/libspl/assert.c:70:1: error: redefinition of 'libspl_gettid' libspl_gettid(void) ^ /Users/imp/git/head/sys/contrib/openzfs/lib/libspl/assert.c:57:1: note: previous definition is here libspl_gettid(void) ^ 1 error generated. *** [assert.o] Error code 1 bmake[3]: stopped in /Users/imp/git/head/cddl/lib/libspl bmake[3]: 1 error Looks like two identical copies of #if defined(__APPLE__) static inline uint64_t libspl_gettid(void) { uint64_t tid; if (pthread_threadid_np(NULL, &tid) !=3D 0) tid =3D 0; return (tid); } #endif which normally aren't compiled on !macos. Removing one fixes the issue. Should I just commit because this is a mismerge, or should I let you take care of it with upstream? Warner On Fri, May 31, 2024 at 9:01=E2=80=AFAM Martin Matuska <mm@freebsd.org> wro= te: > The branch main has been updated by mm: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Daca928a50a42f00f344df934005b09d= bcb4e2f77 > > commit aca928a50a42f00f344df934005b09dbcb4e2f77 > Merge: d28bbfa2715a e2357561b949 > Author: Martin Matuska <mm@FreeBSD.org> > AuthorDate: 2024-05-31 07:31:58 +0000 > Commit: Martin Matuska <mm@FreeBSD.org> > CommitDate: 2024-05-31 09:26:50 +0000 > > zfs: merge openzfs/zfs@e2357561b > > Notable upstream pull request merges: > #15940 41ae864b6 Replace P2ALIGN with P2ALIGN_TYPED and delete P2ALI= GN > #16128 5137c132a zpool import output is not formated properly > #16138 efbef9e6c FreeBSD: Add zfs_link_create() error handling > #16146 04bae5ec9 Disable high priority ZIO threads on FreeBSD and > Linux > #16151 cc3869153 zfs_ioc_send: use a dedicated taskq thread for send > #16151 adda768e3 spa: remove spa_taskq_dispatch_sync() > #16151 515c4dd21 spa: flatten spa_taskq_dispatch_ent() > #16151 0a543db37 spa_taskq_dispatch_ent: simplify arguments > #16153 975a13259 Add support for parallel pool exports > #16153 89acef992 Simplified the scope of the namespace lock > #16159 136c05321 ZAP: Fix leaf references on zap_expand_leaf() error= s > #16162 af5dbed31 Fix scn_queue races on very old pools > #16165 3400127a7 Fix ZIL clone records for legacy holes > #16167 414acbd37 Unbreak FreeBSD cross-build on MacOS broken in > 051460b8b > #16172 eced2e2f1 libzfs: Fix mounting datasets under thread limit > pressure > #16178 b64afa41d Better control the thread pool size when mounting > datasets > #16181 fa99d9cd9 zfs_dbgmsg_print: make FreeBSD and Linux consistent > #16191 e675852bc dbuf: separate refcount calls for dbuf and dbuf_use= r > #16198 a043b60f1 Correct level handling in zstream recompress > #16204 34906f8bb zap: reuse zap_leaf_t on dbuf reuse after shrink > #16206 d0aa9dbcc Use memset to zero stack allocations containing > unions > #16207 8865dfbca Fix assertion in Persistent L2ARC > #16208 08648cf0d Allow block cloning to be interrupted by a signal > #16210 e2357561b FreeBSD: Add const qualifier to members of struct > opensolaris_utsname > #16214 800d59d57 Some improvements to metaslabs eviction > #16216 02c5aa9b0 Destroy ARC buffer in case of fill error > #16225 01c8efdd5 Simplify issig() > > Obtained from: OpenZFS > OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675 > > cddl/lib/libspl/Makefile | 1 + > sys/contrib/openzfs/cmd/zdb/zdb.c | 132 ++++++-- > sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 2 +- > sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 2 + > .../openzfs/cmd/zed/zed.d/deadman-slot_off.sh | 71 ++++ > sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 7 + > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 6 +- > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 377 > +++++++++++++-------- > .../openzfs/cmd/zstream/zstream_recompress.c | 2 +- > sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- > sys/contrib/openzfs/cmd/ztest.c | 32 +- > sys/contrib/openzfs/config/kernel-types.m4 | 40 +++ > sys/contrib/openzfs/config/kernel.m4 | 2 + > sys/contrib/openzfs/config/zfs-build.m4 | 92 ++--- > sys/contrib/openzfs/include/libzfs.h | 5 +- > .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 3 +- > .../openzfs/include/os/freebsd/spl/sys/misc.h | 10 +- > .../openzfs/include/os/freebsd/spl/sys/sig.h | 8 +- > .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 3 +- > .../openzfs/include/os/linux/spl/sys/signal.h | 5 +- > .../openzfs/include/os/linux/spl/sys/sysmacros.h | 3 +- > .../openzfs/include/os/linux/spl/sys/types.h | 2 + > sys/contrib/openzfs/include/sys/spa_impl.h | 7 +- > sys/contrib/openzfs/include/sys/zfs_context.h | 3 +- > sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- > sys/contrib/openzfs/lib/libefi/rdwr_efi.c | 4 +- > sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 111 +++++- > sys/contrib/openzfs/lib/libspl/Makefile.am | 7 +- > sys/contrib/openzfs/lib/libspl/assert.c | 53 +-- > sys/contrib/openzfs/lib/libspl/backtrace.c | 119 +++++++ > sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + > .../lib/libspl/include/os/linux/sys/sysmacros.h | 3 +- > .../openzfs/lib/libspl/include/sys/backtrace.h | 32 ++ > sys/contrib/openzfs/lib/libtpool/thread_pool.c | 28 +- > sys/contrib/openzfs/lib/libuutil/libuutil.abi | 85 ++++- > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 44 ++- > sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 30 +- > sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 6 +- > .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 3 +- > .../openzfs/lib/libzfs_core/libzfs_core.abi | 89 ++++- > sys/contrib/openzfs/man/man4/zfs.4 | 23 +- > sys/contrib/openzfs/module/icp/io/aes.c | 8 +- > .../openzfs/module/os/freebsd/spl/spl_misc.c | 7 +- > .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 2 +- > .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 25 +- > .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 1 + > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 54 ++- > .../openzfs/module/os/freebsd/zfs/zfs_znode.c | 1 - > .../openzfs/module/os/linux/spl/spl-procfs-list.c | 2 +- > .../openzfs/module/os/linux/spl/spl-taskq.c | 2 +- > .../openzfs/module/os/linux/spl/spl-thread.c | 16 +- > .../openzfs/module/os/linux/zfs/vdev_disk.c | 2 +- > .../openzfs/module/os/linux/zfs/zfs_debug.c | 22 +- > sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 5 +- > sys/contrib/openzfs/module/zcommon/zfs_fletcher.c | 8 +- > sys/contrib/openzfs/module/zfs/arc.c | 6 +- > sys/contrib/openzfs/module/zfs/btree.c | 2 +- > sys/contrib/openzfs/module/zfs/dbuf.c | 35 +- > sys/contrib/openzfs/module/zfs/dmu.c | 5 +- > sys/contrib/openzfs/module/zfs/dmu_diff.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_object.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_recv.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_redact.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- > sys/contrib/openzfs/module/zfs/metaslab.c | 11 +- > sys/contrib/openzfs/module/zfs/spa.c | 100 ++++-- > sys/contrib/openzfs/module/zfs/spa_misc.c | 33 +- > sys/contrib/openzfs/module/zfs/vdev.c | 21 +- > sys/contrib/openzfs/module/zfs/vdev_initialize.c | 9 +- > sys/contrib/openzfs/module/zfs/vdev_raidz.c | 3 +- > sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 3 +- > sys/contrib/openzfs/module/zfs/vdev_trim.c | 9 +- > sys/contrib/openzfs/module/zfs/zap.c | 61 ++-- > sys/contrib/openzfs/module/zfs/zcp.c | 3 +- > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 105 ++++-- > sys/contrib/openzfs/module/zfs/zfs_log.c | 8 +- > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 5 + > sys/contrib/openzfs/module/zfs/zio.c | 27 +- > sys/contrib/openzfs/tests/runfiles/common.run | 3 +- > .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 - > .../tests/zfs-tests/cmd/libzfs_input_check.c | 4 +- > .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + > .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + > .../zpool_export/zpool_export_parallel_admin.ksh | 72 ++++ > .../zpool_export/zpool_export_parallel_pos.ksh | 129 +++++++ > .../tests/functional/deadman/deadman_ratelimit.ksh | 8 +- > sys/modules/zfs/zfs_config.h | 10 +- > sys/modules/zfs/zfs_gitrev.h | 2 +- > 89 files changed, 1694 insertions(+), 610 deletions(-) > > diff --cc cddl/lib/libspl/Makefile > index e432b313d9d0,000000000000..6c43e1750c3c > mode 100644,000000..100644 > --- a/cddl/lib/libspl/Makefile > +++ b/cddl/lib/libspl/Makefile > @@@ -1,49 -1,0 +1,50 @@@ > + > +.include <bsd.init.mk> > +.include <bsd.compiler.mk> > + > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl > +.PATH: ${SRCTOP}/sys/contrib/openzfs/include > + > +LIB=3D spl > +LIBADD=3D > +PACKAGE=3D zfs > + > +SRCS =3D \ > + assert.c \ > ++ backtrace.c \ > + list.c \ > + mkdirp.c \ > + os/freebsd/zone.c \ > + page.c \ > + timestamp.c \ > + include/sys/list.h \ > + include/sys/list_impl.h > + > +# These functions are not required when bootstrapping and the atomic co= de > +# will not compile when building on macOS. > +.if !defined(BOOTSTRAPPING) > +SRCS +=3D \ > + atomic.c \ > + getexecname.c \ > + os/freebsd/getexecname.c \ > + os/freebsd/gethostid.c \ > + os/freebsd/getmntany.c \ > + os/freebsd/mnttab.c > +.endif > + > +WARNS?=3D 2 > +CSTD=3D c99 > +CFLAGS+=3D -DIN_BASE > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/include > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebs= d > +CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/module/icp/include > +CFLAGS+=3D -include > ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+=3D -DHAVE_ISSETUGID > +CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > +.if ${COMPILER_TYPE} =3D=3D "clang" > +CFLAGS.atomic.c+=3D -Wno-error=3Datomic-alignment > +.endif > + > +.include <bsd.lib.mk> > diff --cc sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh > index 000000000000,7b339b3add01..7b339b3add01 > mode 000000,100755..100755 > --- a/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh > +++ b/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh > diff --cc sys/contrib/openzfs/config/kernel-types.m4 > index 000000000000,ed76af28337b..ed76af28337b > mode 000000,100644..100644 > --- a/sys/contrib/openzfs/config/kernel-types.m4 > +++ b/sys/contrib/openzfs/config/kernel-types.m4 > diff --cc sys/contrib/openzfs/lib/libspl/assert.c > index 5b12c14acd6e,d11361b387e2..315ddd6b9a9d > --- a/sys/contrib/openzfs/lib/libspl/assert.c > +++ b/sys/contrib/openzfs/lib/libspl/assert.c > @@@ -51,55 -52,6 +52,19 @@@ > pthread_getname_np(pthread_self(), buf, len); > #endif > > - #if defined(HAVE_LIBUNWIND) > - #define UNW_LOCAL_ONLY > - #include <libunwind.h> > - > - static inline void > - libspl_dump_backtrace(void) > ++#if defined(__APPLE__) > ++static inline uint64_t > ++libspl_gettid(void) > +{ > - unw_context_t uc; > - unw_cursor_t cp; > - unw_word_t ip, off; > - char funcname[128]; > - #ifdef HAVE_LIBUNWIND_ELF > - char objname[128]; > - unw_word_t objoff; > - #endif > ++ uint64_t tid; > + > - fprintf(stderr, "Call trace:\n"); > - unw_getcontext(&uc); > - unw_init_local(&cp, &uc); > - while (unw_step(&cp) > 0) { > - unw_get_reg(&cp, UNW_REG_IP, &ip); > - unw_get_proc_name(&cp, funcname, sizeof (funcname), &off)= ; > - #ifdef HAVE_LIBUNWIND_ELF > - unw_get_elf_filename(&cp, objname, sizeof (objname), > &objoff); > - fprintf(stderr, " [0x%08lx] %s+0x%2lx (in %s +0x%2lx)\n"= , > - ip, funcname, off, objname, objoff); > - #else > - fprintf(stderr, " [0x%08lx] %s+0x%2lx\n", ip, funcname, > off); > - #endif > - } > - } > - #elif defined(HAVE_BACKTRACE) > - #include <execinfo.h> > ++ if (pthread_threadid_np(NULL, &tid) !=3D 0) > ++ tid =3D 0; > + > - static inline void > - libspl_dump_backtrace(void) > - { > - void *btptrs[100]; > - size_t nptrs =3D backtrace(btptrs, 100); > - char **bt =3D backtrace_symbols(btptrs, nptrs); > - fprintf(stderr, "Call trace:\n"); > - for (size_t i =3D 0; i < nptrs; i++) > - fprintf(stderr, " %s\n", bt[i]); > - free(bt); > ++ return (tid); > +} > - #else > - #define libspl_dump_backtrace() > +#endif > + > #if defined(__APPLE__) > static inline uint64_t > libspl_gettid(void) > diff --cc sys/contrib/openzfs/lib/libspl/backtrace.c > index 000000000000,d26d742106e2..d26d742106e2 > mode 000000,100644..100644 > --- a/sys/contrib/openzfs/lib/libspl/backtrace.c > +++ b/sys/contrib/openzfs/lib/libspl/backtrace.c > diff --cc sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h > index 000000000000,f9869ffc9e1a..f9869ffc9e1a > mode 000000,100644..100644 > --- a/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h > +++ b/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h > diff --cc > sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expor= t/zpool_export_parallel_admin.ksh > index 000000000000,cab8fc2b4239..cab8fc2b4239 > mode 000000,100755..100755 > --- > a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_admin.ksh > +++ > b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_admin.ksh > diff --cc > sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expor= t/zpool_export_parallel_pos.ksh > index 000000000000,037d17d082bd..037d17d082bd > mode 000000,100755..100755 > --- > a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_pos.ksh > +++ > b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_pos.ksh > diff --cc sys/modules/zfs/zfs_config.h > index 4d6786e92d22,000000000000..d5e9cebfffc7 > mode 100644,000000..100644 > --- a/sys/modules/zfs/zfs_config.h > +++ b/sys/modules/zfs/zfs_config.h > @@@ -1,1227 -1,0 +1,1233 @@@ > +/* > + */ > + > +/* 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 */ > + > +/* add_disk() returns int */ > +/* #undef HAVE_ADD_DISK_RET */ > + > +/* Define if host toolchain supports AES */ > +#define HAVE_AES 1 > + > +/* Define if you have [rt] */ > +#define HAVE_AIO_H 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 > + > ++/* backtrace() is available */ > ++/* #undef HAVE_BACKTRACE */ > ++ > +/* bdevname() is available */ > +/* #undef HAVE_BDEVNAME */ > + > +/* bdev_check_media_change() exists */ > +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ > + > +/* bdev_file_open_by_path() exists */ > +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ > + > +/* bdev_*_io_acct() available */ > +/* #undef HAVE_BDEV_IO_ACCT_63 */ > + > +/* bdev_*_io_acct() available */ > +/* #undef HAVE_BDEV_IO_ACCT_OLD */ > + > +/* bdev_kobj() exists */ > +/* #undef HAVE_BDEV_KOBJ */ > + > +/* bdev_max_discard_sectors() is available */ > +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ > + > +/* bdev_max_secure_erase_sectors() is available */ > +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ > + > +/* bdev_open_by_path() exists */ > +/* #undef HAVE_BDEV_OPEN_BY_PATH */ > + > +/* bdev_release() exists */ > +/* #undef HAVE_BDEV_RELEASE */ > + > +/* block_device_operations->submit_bio() returns void */ > +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ > + > +/* bdev_whole() is available */ > +/* #undef HAVE_BDEV_WHOLE */ > + > +/* bio_alloc() takes 4 arguments */ > +/* #undef HAVE_BIO_ALLOC_4ARG */ > + > +/* 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_dev() is a macro */ > +/* #undef HAVE_BIO_SET_DEV_MACRO */ > + > +/* bio_set_op_attrs is available */ > +/* #undef HAVE_BIO_SET_OP_ATTRS */ > + > +/* blkdev_get_by_path() exists and takes 4 args */ > +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ > + > +/* blkdev_get_by_path() handles ERESTARTSYS */ > +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ > + > +/* __blkdev_issue_discard(flags) is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ > + > +/* __blkdev_issue_discard() is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ > + > +/* blkdev_issue_discard(flags) is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ > + > +/* blkdev_issue_discard() is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ > + > +/* blkdev_issue_secure_erase() is available */ > +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ > + > +/* blkdev_put() exists */ > +/* #undef HAVE_BLKDEV_PUT */ > + > +/* blkdev_put() accepts void* as arg 2 */ > +/* #undef HAVE_BLKDEV_PUT_HOLDER */ > + > +/* 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_disk() exists and takes 2 args */ > +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ > + > +/* 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_cleanup_disk() exists */ > +/* #undef HAVE_BLK_CLEANUP_DISK */ > + > +/* blk_mode_t is defined */ > +/* #undef HAVE_BLK_MODE_T */ > + > +/* block multiqueue is available */ > +/* #undef HAVE_BLK_MQ */ > + > +/* block multiqueue hardware context is cached in struct request */ > +/* #undef HAVE_BLK_MQ_RQ_HCTX */ > + > +/* blk queue backing_dev_info is dynamic */ > +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ > + > +/* blk_queue_discard() is available */ > +/* #undef HAVE_BLK_QUEUE_DISCARD */ > + > +/* 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 */ > + > +/* BLK_STS_RESV_CONFLICT is defined */ > +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ > + > +/* Define if release() in block_device_operations takes 1 arg */ > +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ > + > +/* 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_splice_read exists */ > +/* #undef HAVE_COPY_SPLICE_READ */ > + > +/* copy_to_iter() is available */ > +/* #undef HAVE_COPY_TO_ITER */ > + > +/* cpu_has_feature() is GPL-only */ > +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ > + > +/* 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 */ > + > +/* dentry aliases are in d_u member */ > +/* #undef HAVE_DENTRY_D_U_ALIASES */ > + > +/* dequeue_signal() takes 4 arguments */ > +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ > + > +/* lookup_bdev() wants dev_t arg */ > +/* #undef HAVE_DEVT_LOOKUP_BDEV */ > + > +/* sops->dirty_inode() wants flags */ > +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ > + > +/* disk_check_media_change() exists */ > +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ > + > +/* 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 */ > + > +/* Define to 1 if you have the 'execvpe' function. */ > +#define HAVE_EXECVPE 1 > + > +/* FALLOC_FL_ZERO_RANGE is defined */ > +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ > + > +/* fault_in_iov_iter_readable() is available */ > +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ > + > +/* filemap_range_has_page() is available */ > +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ > + > +/* fops->aio_fsync() exists */ > +/* #undef HAVE_FILE_AIO_FSYNC */ > + > +/* file_dentry() is available */ > +/* #undef HAVE_FILE_DENTRY */ > + > +/* fops->fadvise() exists */ > +/* #undef HAVE_FILE_FADVISE */ > + > +/* file_inode() is available */ > +/* #undef HAVE_FILE_INODE */ > + > +/* flush_dcache_page() is GPL-only */ > +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ > + > +/* iops->follow_link() cookie */ > +/* #undef HAVE_FOLLOW_LINK_COOKIE */ > + > +/* iops->follow_link() nameidata */ > +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ > + > +/* Define if compiler supports -Wformat-overflow */ > +/* #undef HAVE_FORMAT_OVERFLOW */ > + > +/* fsync_bdev() is declared in include/blkdev.h */ > +/* #undef HAVE_FSYNC_BDEV */ > + > +/* fops->fsync() with range */ > +/* #undef HAVE_FSYNC_RANGE */ > + > +/* fops->fsync() without dentry */ > +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ > + > +/* yes */ > +/* #undef HAVE_GENERIC_FADVISE */ > + > +/* generic_fillattr requires struct mnt_idmap* */ > +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ > + > +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ > +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ > + > +/* 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 */ > + > +/* Define to 1 if you have the 'gettid' function. */ > +/* #undef HAVE_GETTID */ > + > +/* iops->get_acl() exists */ > +/* #undef HAVE_GET_ACL */ > + > +/* iops->get_acl() takes rcu */ > +/* #undef HAVE_GET_ACL_RCU */ > + > +/* has iops->get_inode_acl() */ > +/* #undef HAVE_GET_INODE_ACL */ > + > +/* 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 */ > + > +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ > +/* #undef HAVE_IATTR_VFSID */ > + > +/* Define if you have the iconv() function and it works. */ > +#define HAVE_ICONV 1 > + > +/* iops->getattr() takes struct mnt_idmap* */ > +/* #undef HAVE_IDMAP_IOPS_GETATTR */ > + > +/* iops->setattr() takes struct mnt_idmap* */ > +/* #undef HAVE_IDMAP_IOPS_SETATTR */ > + > +/* APIs for idmapped mount are present */ > +/* #undef HAVE_IDMAP_MNT_API */ > + > +/* mnt_idmap does not have user_namespace */ > +/* #undef HAVE_IDMAP_NO_USERNS */ > + > +/* Define if compiler supports -Wimplicit-fallthrough */ > +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ > + > +/* Define if compiler supports -Winfinite-recursion */ > +/* #undef HAVE_INFINITE_RECURSION */ > + > +/* inode_get_atime() exists in linux/fs.h */ > +/* #undef HAVE_INODE_GET_ATIME */ > + > +/* inode_get_ctime() exists in linux/fs.h */ > +/* #undef HAVE_INODE_GET_CTIME */ > + > +/* inode_get_mtime() exists in linux/fs.h */ > +/* #undef HAVE_INODE_GET_MTIME */ > + > +/* yes */ > +/* #undef HAVE_INODE_LOCK_SHARED */ > + > +/* inode_owner_or_capable() exists */ > +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ > + > +/* inode_owner_or_capable() takes mnt_idmap */ > +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ > + > +/* inode_owner_or_capable() takes user_ns */ > +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ > + > +/* inode_set_atime_to_ts() exists in linux/fs.h */ > +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ > + > +/* inode_set_ctime_to_ts() exists in linux/fs.h */ > +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ > + > +/* inode_set_flags() exists */ > +/* #undef HAVE_INODE_SET_FLAGS */ > + > +/* inode_set_iversion() exists */ > +/* #undef HAVE_INODE_SET_IVERSION */ > + > +/* inode_set_mtime_to_ts() exists in linux/fs.h */ > +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ > + > +/* 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 mnt_idmap* */ > +/* #undef HAVE_IOPS_CREATE_IDMAP */ > + > +/* iops->create() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_CREATE_USERNS */ > + > +/* iops->mkdir() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_MKDIR_IDMAP */ > + > +/* iops->mkdir() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_MKDIR_USERNS */ > + > +/* iops->mknod() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_MKNOD_IDMAP */ > + > +/* iops->mknod() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_MKNOD_USERNS */ > + > +/* iops->permission() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ > + > +/* iops->permission() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_PERMISSION_USERNS */ > + > +/* iops->rename() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_RENAME_IDMAP */ > + > +/* iops->rename() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_RENAME_USERNS */ > + > +/* iops->setattr() exists */ > +/* #undef HAVE_IOPS_SETATTR */ > + > +/* iops->symlink() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ > + > +/* 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_type() is available */ > +/* #undef HAVE_IOV_ITER_TYPE */ > + > +/* 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 > + > +/* iter_iov() is available */ > +/* #undef HAVE_ITER_IOV */ > + > +/* 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 */ > + > +/* kernel has asm/fpu/internal.h */ > +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ > + > +/* uncached_acl_sentinel() exists */ > +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ > + > +/* Define if compiler supports -Winfinite-recursion */ > +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ > + > ++/* kernel defines intptr_t */ > ++/* #undef HAVE_KERNEL_INTPTR_T */ > ++ > +/* kernel has kernel_neon_* functions */ > +/* #undef HAVE_KERNEL_NEON */ > + > +/* 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 */ > + > +/* strlcpy() exists */ > +/* #undef HAVE_KERNEL_STRLCPY */ > + > +/* strscpy() exists */ > +/* #undef HAVE_KERNEL_STRSCPY */ > + > +/* 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 [unwind] */ > +/* #undef HAVE_LIBUNWIND */ > + > +/* libunwind has unw_get_elf_filename */ > +/* #undef HAVE_LIBUNWIND_ELF */ > + > +/* Define if you have [uuid] */ > +/* #undef HAVE_LIBUUID */ > + > +/* linux/blk-cgroup.h exists */ > +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ > + > +/* 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 */ > *** 552 LINES SKIPPED *** > --0000000000006990d20619c5a9d5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">This seems to break macos bootstrap:<div><br></div><div>% = ./tools/build/make.py TARGET=3Darm64 TARGET_ARCH=3Daarch64 -DNOCLEAN buildw= orld -j 20<br></div><div>...</div><div>--- assert.o ---<br>/Users/imp/git/h= ead/sys/contrib/openzfs/lib/libspl/assert.c:70:1: error: redefinition of &#= 39;libspl_gettid'<br>libspl_gettid(void)<br>^<br>/Users/imp/git/head/sy= s/contrib/openzfs/lib/libspl/assert.c:57:1: note: previous definition is he= re<br>libspl_gettid(void)<br>^<br>1 error generated.<br>*** [assert.o] Erro= r code 1<br><br>bmake[3]: stopped in /Users/imp/git/head/cddl/lib/libspl<br= >bmake[3]: 1 error<br></div><div><br></div><div>Looks like two identical co= pies of</div><div>#if defined(__APPLE__)<br>static inline uint64_t<br>libsp= l_gettid(void)<br>{<br> uint64_t tid;<br><br> if (pthread_threadid_np(NULL,= &tid) !=3D 0)<br> tid =3D 0;<br><br> return (tid);<br>}<br>#endif<br>= <br></div><div>which normally aren't compiled on !macos. Removing one f= ixes the issue. Should I just commit because this is a mismerge, or should = I let you take care of it with upstream?</div><div><br></div><div>Warner</d= iv></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_att= r">On Fri, May 31, 2024 at 9:01=E2=80=AFAM Martin Matuska <<a href=3D"ma= ilto:mm@freebsd.org">mm@freebsd.org</a>> wrote:<br></div><blockquote cla= ss=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid = rgb(204,204,204);padding-left:1ex">The branch main has been updated by mm:<= br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Daca928a50a42f00f3= 44df934005b09dbcb4e2f77" rel=3D"noreferrer" target=3D"_blank">https://cgit.= FreeBSD.org/src/commit/?id=3Daca928a50a42f00f344df934005b09dbcb4e2f77</a><b= r> <br> commit aca928a50a42f00f344df934005b09dbcb4e2f77<br> Merge: d28bbfa2715a e2357561b949<br> Author:=C2=A0 =C2=A0 =C2=A0Martin Matuska <mm@FreeBSD.org><br> AuthorDate: 2024-05-31 07:31:58 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Martin Matuska <mm@FreeBSD.org><br> CommitDate: 2024-05-31 09:26:50 +0000<br> <br> =C2=A0 =C2=A0 zfs: merge openzfs/zfs@e2357561b<br> <br> =C2=A0 =C2=A0 Notable upstream pull request merges:<br> =C2=A0 =C2=A0 =C2=A0#15940 41ae864b6 Replace P2ALIGN with P2ALIGN_TYPED and= delete P2ALIGN<br> =C2=A0 =C2=A0 =C2=A0#16128 5137c132a zpool import output is not formated pr= operly<br> =C2=A0 =C2=A0 =C2=A0#16138 efbef9e6c FreeBSD: Add zfs_link_create() error h= andling<br> =C2=A0 =C2=A0 =C2=A0#16146 04bae5ec9 Disable high priority ZIO threads on F= reeBSD and Linux<br> =C2=A0 =C2=A0 =C2=A0#16151 cc3869153 zfs_ioc_send: use a dedicated taskq th= read for send<br> =C2=A0 =C2=A0 =C2=A0#16151 adda768e3 spa: remove spa_taskq_dispatch_sync()<= br> =C2=A0 =C2=A0 =C2=A0#16151 515c4dd21 spa: flatten spa_taskq_dispatch_ent()<= br> =C2=A0 =C2=A0 =C2=A0#16151 0a543db37 spa_taskq_dispatch_ent: simplify argum= ents<br> =C2=A0 =C2=A0 =C2=A0#16153 975a13259 Add support for parallel pool exports<= br> =C2=A0 =C2=A0 =C2=A0#16153 89acef992 Simplified the scope of the namespace = lock<br> =C2=A0 =C2=A0 =C2=A0#16159 136c05321 ZAP: Fix leaf references on zap_expand= _leaf() errors<br> =C2=A0 =C2=A0 =C2=A0#16162 af5dbed31 Fix scn_queue races on very old pools<= br> =C2=A0 =C2=A0 =C2=A0#16165 3400127a7 Fix ZIL clone records for legacy holes= <br> =C2=A0 =C2=A0 =C2=A0#16167 414acbd37 Unbreak FreeBSD cross-build on MacOS b= roken in 051460b8b<br> =C2=A0 =C2=A0 =C2=A0#16172 eced2e2f1 libzfs: Fix mounting datasets under th= read limit pressure<br> =C2=A0 =C2=A0 =C2=A0#16178 b64afa41d Better control the thread pool size wh= en mounting datasets<br> =C2=A0 =C2=A0 =C2=A0#16181 fa99d9cd9 zfs_dbgmsg_print: make FreeBSD and Lin= ux consistent<br> =C2=A0 =C2=A0 =C2=A0#16191 e675852bc dbuf: separate refcount calls for dbuf= and dbuf_user<br> =C2=A0 =C2=A0 =C2=A0#16198 a043b60f1 Correct level handling in zstream reco= mpress<br> =C2=A0 =C2=A0 =C2=A0#16204 34906f8bb zap: reuse zap_leaf_t on dbuf reuse af= ter shrink<br> =C2=A0 =C2=A0 =C2=A0#16206 d0aa9dbcc Use memset to zero stack allocations c= ontaining unions<br> =C2=A0 =C2=A0 =C2=A0#16207 8865dfbca Fix assertion in Persistent L2ARC<br> =C2=A0 =C2=A0 =C2=A0#16208 08648cf0d Allow block cloning to be interrupted = by a signal<br> =C2=A0 =C2=A0 =C2=A0#16210 e2357561b FreeBSD: Add const qualifier to member= s of struct<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opensolaris_utsname<br> =C2=A0 =C2=A0 =C2=A0#16214 800d59d57 Some improvements to metaslabs evictio= n<br> =C2=A0 =C2=A0 =C2=A0#16216 02c5aa9b0 Destroy ARC buffer in case of fill err= or<br> =C2=A0 =C2=A0 =C2=A0#16225 01c8efdd5 Simplify issig()<br> <br> =C2=A0 =C2=A0 Obtained from:=C2=A0 OpenZFS<br> =C2=A0 =C2=A0 OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675<br> <br> =C2=A0cddl/lib/libspl/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A01 +<br> =C2=A0sys/contrib/openzfs/cmd/zdb/zdb.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 132 ++++++--<br> =C2=A0sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A02 +<br> =C2=A0.../openzfs/cmd/zed/zed.d/deadman-slot_off.sh=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 71 ++++<br> =C2=A0sys/contrib/openzfs/cmd/zed/zed.d/zed.rc=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|=C2=A0 =C2=A07 +<br> =C2=A0sys/contrib/openzfs/cmd/zfs/zfs_main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 =C2=A06 +-<br> =C2=A0sys/contrib/openzfs/cmd/zpool/zpool_main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 377 +++++++++++++--------<br> =C2=A0.../openzfs/cmd/zstream/zstream_recompress.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/cmd/zstream/zstream_redup.c=C2=A0 =C2=A0 |=C2=A0 = =C2=A04 +-<br> =C2=A0sys/contrib/openzfs/cmd/ztest.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 32 +-<br> =C2=A0sys/contrib/openzfs/config/kernel-types.m4=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 40 +++<br> =C2=A0sys/contrib/openzfs/config/kernel.m4=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A02 +<br> =C2=A0sys/contrib/openzfs/config/zfs-build.m4=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 92 ++---<br> =C2=A0sys/contrib/openzfs/include/libzfs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A05 +-<br> =C2=A0.../openzfs/include/os/freebsd/spl/sys/ccompile.h=C2=A0 |=C2=A0 =C2= =A03 +-<br> =C2=A0.../openzfs/include/os/freebsd/spl/sys/misc.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 10 +-<br> =C2=A0.../openzfs/include/os/freebsd/spl/sys/sig.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A08 +-<br> =C2=A0.../openzfs/include/os/freebsd/spl/sys/sysmacros.h |=C2=A0 =C2=A03 +-= <br> =C2=A0.../openzfs/include/os/linux/spl/sys/signal.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A05 +-<br> =C2=A0.../openzfs/include/os/linux/spl/sys/sysmacros.h=C2=A0 =C2=A0|=C2=A0 = =C2=A03 +-<br> =C2=A0.../openzfs/include/os/linux/spl/sys/types.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A02 +<br> =C2=A0sys/contrib/openzfs/include/sys/spa_impl.h=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A07 +-<br> =C2=A0sys/contrib/openzfs/include/sys/zfs_context.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A03 +-<br> =C2=A0sys/contrib/openzfs/include/sys/zfs_debug.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/lib/libefi/rdwr_efi.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A04 +-<br> =C2=A0sys/contrib/openzfs/lib/libnvpair/libnvpair.abi=C2=A0 =C2=A0 | 111 ++= +++-<br> =C2=A0sys/contrib/openzfs/lib/libspl/Makefile.am=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A07 +-<br> =C2=A0sys/contrib/openzfs/lib/libspl/assert.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 53 +--<br> =C2=A0sys/contrib/openzfs/lib/libspl/backtrace.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 119 +++++++<br> =C2=A0sys/contrib/openzfs/lib/libspl/include/Makefile.am |=C2=A0 =C2=A01 +<= br> =C2=A0.../lib/libspl/include/os/linux/sys/sysmacros.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A03 +-<br> =C2=A0.../openzfs/lib/libspl/include/sys/backtrace.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 32 ++<br> =C2=A0sys/contrib/openzfs/lib/libtpool/thread_pool.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 28 +-<br> =C2=A0sys/contrib/openzfs/lib/libuutil/libuutil.abi=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 85 ++++-<br> =C2=A0sys/contrib/openzfs/lib/libzfs/libzfs.abi=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 44 ++-<br> =C2=A0sys/contrib/openzfs/lib/libzfs/libzfs_mount.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 30 +-<br> =C2=A0sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c=C2=A0 =C2=A0|=C2=A0 = =C2=A06 +-<br> =C2=A0.../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c=C2=A0 =C2=A0|=C2=A0 = =C2=A03 +-<br> =C2=A0.../openzfs/lib/libzfs_core/libzfs_core.abi=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 89 ++++-<br> =C2=A0sys/contrib/openzfs/man/man4/zfs.4=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 23 +-<br> =C2=A0sys/contrib/openzfs/module/icp/io/aes.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 =C2=A08 +-<br> =C2=A0.../openzfs/module/os/freebsd/spl/spl_misc.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A07 +-<br> =C2=A0.../openzfs/module/os/freebsd/zfs/vdev_geom.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A02 +-<br> =C2=A0.../openzfs/module/os/freebsd/zfs/zfs_debug.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 25 +-<br> =C2=A0.../openzfs/module/os/freebsd/zfs/zfs_dir.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A01 +<br> =C2=A0.../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c=C2=A0 =C2=A0|=C2=A0 = 54 ++-<br> =C2=A0.../openzfs/module/os/freebsd/zfs/zfs_znode.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A01 -<br> =C2=A0.../openzfs/module/os/linux/spl/spl-procfs-list.c=C2=A0 |=C2=A0 =C2= =A02 +-<br> =C2=A0.../openzfs/module/os/linux/spl/spl-taskq.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-<br> =C2=A0.../openzfs/module/os/linux/spl/spl-thread.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 16 +-<br> =C2=A0.../openzfs/module/os/linux/zfs/vdev_disk.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-<br> =C2=A0.../openzfs/module/os/linux/zfs/zfs_debug.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 22 +-<br> =C2=A0sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c=C2=A0 |=C2=A0 =C2= =A05 +-<br> =C2=A0sys/contrib/openzfs/module/zcommon/zfs_fletcher.c=C2=A0 |=C2=A0 =C2= =A08 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/arc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A06 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/btree.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dbuf.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 35 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A05 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu_diff.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu_object.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu_objset.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu_recv.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu_redact.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/dmu_send.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A02 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/metaslab.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 11 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/spa.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0| 100 ++++--<br> =C2=A0sys/contrib/openzfs/module/zfs/spa_misc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 33 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/vdev.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 21 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/vdev_initialize.c=C2=A0 =C2=A0|=C2=A0 = =C2=A09 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/vdev_raidz.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A03 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/vdev_rebuild.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A03 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/vdev_trim.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A09 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/zap.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 61 ++--<br> =C2=A0sys/contrib/openzfs/module/zfs/zcp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A03 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/zfs_ioctl.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 105 ++++--<br> =C2=A0sys/contrib/openzfs/module/zfs/zfs_log.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|=C2=A0 =C2=A08 +-<br> =C2=A0sys/contrib/openzfs/module/zfs/zfs_vnops.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A05 +<br> =C2=A0sys/contrib/openzfs/module/zfs/zio.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 27 +-<br> =C2=A0sys/contrib/openzfs/tests/runfiles/common.run=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A03 +-<br> =C2=A0.../openzfs/tests/test-runner/bin/<a href=3D"http://zts-report.py.in"= rel=3D"noreferrer" target=3D"_blank">zts-report.py.in</a> |=C2=A0 =C2=A01 = -<br> =C2=A0.../tests/zfs-tests/cmd/libzfs_input_check.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A04 +-<br> =C2=A0.../openzfs/tests/zfs-tests/include/tunables.cfg=C2=A0 =C2=A0|=C2=A0 = =C2=A01 +<br> =C2=A0.../openzfs/tests/zfs-tests/tests/Makefile.am=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A02 +<br> =C2=A0.../zpool_export/zpool_export_parallel_admin.ksh=C2=A0 =C2=A0|=C2=A0 = 72 ++++<br> =C2=A0.../zpool_export/zpool_export_parallel_pos.ksh=C2=A0 =C2=A0 =C2=A0| 1= 29 +++++++<br> =C2=A0.../tests/functional/deadman/deadman_ratelimit.ksh |=C2=A0 =C2=A08 +-= <br> =C2=A0sys/modules/zfs/zfs_config.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 10 +-<br> =C2=A0sys/modules/zfs/zfs_gitrev.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A02 +-<br> =C2=A089 files changed, 1694 insertions(+), 610 deletions(-)<br> <br> diff --cc cddl/lib/libspl/Makefile<br> index e432b313d9d0,000000000000..6c43e1750c3c<br> mode 100644,000000..100644<br> --- a/cddl/lib/libspl/Makefile<br> +++ b/cddl/lib/libspl/Makefile<br> @@@ -1,49 -1,0 +1,50 @@@<br> =C2=A0+<br> =C2=A0+.include <<a href=3D"http://bsd.init.mk" rel=3D"noreferrer" targe= t=3D"_blank">bsd.init.mk</a>><br> =C2=A0+.include <<a href=3D"http://bsd.compiler.mk" rel=3D"noreferrer" t= arget=3D"_blank">bsd.compiler.mk</a>><br> =C2=A0+<br> =C2=A0+.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl<br> =C2=A0+.PATH: ${SRCTOP}/sys/contrib/openzfs/include<br> =C2=A0+<br> =C2=A0+LIB=3D=C2=A0 spl<br> =C2=A0+LIBADD=3D<br> =C2=A0+PACKAGE=3D=C2=A0 =C2=A0 =C2=A0 zfs<br> =C2=A0+<br> =C2=A0+SRCS =3D \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 assert.c \<br> ++=C2=A0 =C2=A0 =C2=A0 backtrace.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 list.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 mkdirp.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/zone.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 page.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 timestamp.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 include/sys/list.h \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 include/sys/list_impl.h<br> =C2=A0+<br> =C2=A0+# These functions are not required when bootstrapping and the atomic= code<br> =C2=A0+# will not compile when building on macOS.<br> =C2=A0+.if !defined(BOOTSTRAPPING)<br> =C2=A0+SRCS +=3D \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 atomic.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 getexecname.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/getexecname.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/gethostid.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/getmntany.c \<br> =C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/mnttab.c<br> =C2=A0+.endif<br> =C2=A0+<br> =C2=A0+WARNS?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A02<br> =C2=A0+CSTD=3D c99<br> =C2=A0+CFLAGS+=3D -DIN_BASE<br> =C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/include<br> =C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/<br> =C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/fre= ebsd<br> =C2=A0+CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include<br> =C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/module/icp/include<br> =C2=A0+CFLAGS+=3D -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd= /spl/sys/ccompile.h<br> =C2=A0+CFLAGS+=3D -DHAVE_ISSETUGID<br> =C2=A0+CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h<br> =C2=A0+.if ${COMPILER_TYPE} =3D=3D "clang"<br> =C2=A0+CFLAGS.atomic.c+=3D=C2=A0 =C2=A0 =C2=A0-Wno-error=3Datomic-alignment= <br> =C2=A0+.endif<br> =C2=A0+<br> =C2=A0+.include <<a href=3D"http://bsd.lib.mk" rel=3D"noreferrer" target= =3D"_blank">bsd.lib.mk</a>><br> diff --cc sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh<br> index 000000000000,7b339b3add01..7b339b3add01<br> mode 000000,100755..100755<br> --- a/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh<br> +++ b/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh<br> diff --cc sys/contrib/openzfs/config/kernel-types.m4<br> index 000000000000,ed76af28337b..ed76af28337b<br> mode 000000,100644..100644<br> --- a/sys/contrib/openzfs/config/kernel-types.m4<br> +++ b/sys/contrib/openzfs/config/kernel-types.m4<br> diff --cc sys/contrib/openzfs/lib/libspl/assert.c<br> index 5b12c14acd6e,d11361b387e2..315ddd6b9a9d<br> --- a/sys/contrib/openzfs/lib/libspl/assert.c<br> +++ b/sys/contrib/openzfs/lib/libspl/assert.c<br> @@@ -51,55 -52,6 +52,19 @@@<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 pthread_getname_np(pthread_self(), buf, len);<b= r> =C2=A0 #endif<br> <br> - #if defined(HAVE_LIBUNWIND)<br> - #define=C2=A0 =C2=A0 =C2=A0 =C2=A0UNW_LOCAL_ONLY<br> - #include <libunwind.h><br> - <br> - static inline void<br> - libspl_dump_backtrace(void)<br> ++#if defined(__APPLE__)<br> ++static inline uint64_t<br> ++libspl_gettid(void)<br> =C2=A0+{<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_context_t uc;<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_cursor_t cp;<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_word_t ip, off;<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0char funcname[128];<br> - #ifdef HAVE_LIBUNWIND_ELF<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0char objname[128];<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_word_t objoff;<br> - #endif<br> ++=C2=A0 =C2=A0 =C2=A0 uint64_t tid;<br> =C2=A0+<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, "Call trace:\n");<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_getcontext(&uc);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_init_local(&cp, &uc);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0while (unw_step(&cp) > 0) {<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unw_get_reg(&cp= , UNW_REG_IP, &ip);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unw_get_proc_name(&= amp;cp, funcname, sizeof (funcname), &off);<br> - #ifdef HAVE_LIBUNWIND_ELF<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unw_get_elf_filenam= e(&cp, objname, sizeof (objname), &objoff);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, &qu= ot;=C2=A0 [0x%08lx] %s+0x%2lx (in %s +0x%2lx)\n",<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ip, f= uncname, off, objname, objoff);<br> - #else<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, &qu= ot;=C2=A0 [0x%08lx] %s+0x%2lx\n", ip, funcname, off);<br> - #endif<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0}<br> - }<br> - #elif defined(HAVE_BACKTRACE)<br> - #include <execinfo.h><br> ++=C2=A0 =C2=A0 =C2=A0 if (pthread_threadid_np(NULL, &tid) !=3D 0)<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tid =3D 0;<br> =C2=A0+<br> - static inline void<br> - libspl_dump_backtrace(void)<br> - {<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0void *btptrs[100];<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0size_t nptrs =3D backtrace(btptrs, 100);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0char **bt =3D backtrace_symbols(btptrs, nptrs);= <br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, "Call trace:\n");<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0for (size_t i =3D 0; i < nptrs; i++)<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, &qu= ot;=C2=A0 %s\n", bt[i]);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0free(bt);<br> ++=C2=A0 =C2=A0 =C2=A0 return (tid);<br> =C2=A0+}<br> - #else<br> - #define=C2=A0 =C2=A0 =C2=A0 =C2=A0libspl_dump_backtrace()<br> =C2=A0+#endif<br> =C2=A0+<br> =C2=A0 #if defined(__APPLE__)<br> =C2=A0 static inline uint64_t<br> =C2=A0 libspl_gettid(void)<br> diff --cc sys/contrib/openzfs/lib/libspl/backtrace.c<br> index 000000000000,d26d742106e2..d26d742106e2<br> mode 000000,100644..100644<br> --- a/sys/contrib/openzfs/lib/libspl/backtrace.c<br> +++ b/sys/contrib/openzfs/lib/libspl/backtrace.c<br> diff --cc sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h<br> index 000000000000,f9869ffc9e1a..f9869ffc9e1a<br> mode 000000,100644..100644<br> --- a/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h<br> +++ b/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h<br> diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpo= ol_export/zpool_export_parallel_admin.ksh<br> index 000000000000,cab8fc2b4239..cab8fc2b4239<br> mode 000000,100755..100755<br> --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_admin.ksh<br> +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_admin.ksh<br> diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpo= ol_export/zpool_export_parallel_pos.ksh<br> index 000000000000,037d17d082bd..037d17d082bd<br> mode 000000,100755..100755<br> --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_pos.ksh<br> +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_pos.ksh<br> diff --cc sys/modules/zfs/zfs_config.h<br> index 4d6786e92d22,000000000000..d5e9cebfffc7<br> mode 100644,000000..100644<br> --- a/sys/modules/zfs/zfs_config.h<br> +++ b/sys/modules/zfs/zfs_config.h<br> @@@ -1,1227 -1,0 +1,1233 @@@<br> =C2=A0+/*<br> =C2=A0+ */<br> =C2=A0+<br> =C2=A0+/* zfs_config.h.=C2=A0 Generated from <a href=3D"http://zfs_config.h= .in" rel=3D"noreferrer" target=3D"_blank">zfs_config.h.in</a> by configure.= =C2=A0 */<br> =C2=A0+/* <a href=3D"http://zfs_config.h.in" rel=3D"noreferrer" target=3D"_= blank">zfs_config.h.in</a>.=C2=A0 Generated from <a href=3D"http://configur= e.ac" rel=3D"noreferrer" target=3D"_blank">configure.ac</a> by autoheader.= =C2=A0 */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if translation of program messages to the user's = native<br> =C2=A0+=C2=A0 =C2=A0language is requested. */<br> =C2=A0+/* #undef ENABLE_NLS */<br> =C2=A0+<br> =C2=A0+/* bio_end_io_t wants 1 arg */<br> =C2=A0+/* #undef HAVE_1ARG_BIO_END_IO_T */<br> =C2=A0+<br> =C2=A0+/* lookup_bdev() wants 1 arg */<br> =C2=A0+/* #undef HAVE_1ARG_LOOKUP_BDEV */<br> =C2=A0+<br> =C2=A0+/* submit_bio() wants 1 arg */<br> =C2=A0+/* #undef HAVE_1ARG_SUBMIT_BIO */<br> =C2=A0+<br> =C2=A0+/* bdi_setup_and_register() wants 2 args */<br> =C2=A0+/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */<br> =C2=A0+<br> =C2=A0+/* vfs_getattr wants 2 args */<br> =C2=A0+/* #undef HAVE_2ARGS_VFS_GETATTR */<br> =C2=A0+<br> =C2=A0+/* zlib_deflate_workspacesize() wants 2 args */<br> =C2=A0+/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */<br> =C2=A0+<br> =C2=A0+/* bdi_setup_and_register() wants 3 args */<br> =C2=A0+/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */<br> =C2=A0+<br> =C2=A0+/* vfs_getattr wants 3 args */<br> =C2=A0+/* #undef HAVE_3ARGS_VFS_GETATTR */<br> =C2=A0+<br> =C2=A0+/* vfs_getattr wants 4 args */<br> =C2=A0+/* #undef HAVE_4ARGS_VFS_GETATTR */<br> =C2=A0+<br> =C2=A0+/* kernel has access_ok with 'type' parameter */<br> =C2=A0+/* #undef HAVE_ACCESS_OK_TYPE */<br> =C2=A0+<br> =C2=A0+/* posix_acl has refcount_t */<br> =C2=A0+/* #undef HAVE_ACL_REFCOUNT */<br> =C2=A0+<br> =C2=A0+/* add_disk() returns int */<br> =C2=A0+/* #undef HAVE_ADD_DISK_RET */<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AES */<br> =C2=A0+#define HAVE_AES 1<br> =C2=A0+<br> =C2=A0+/* Define if you have [rt] */<br> =C2=A0+#define HAVE_AIO_H 1<br> =C2=A0+<br> =C2=A0+#ifdef __amd64__<br> =C2=A0+#ifndef RESCUE<br> =C2=A0+/* Define if host toolchain supports AVX */<br> =C2=A0+#define HAVE_AVX 1<br> =C2=A0+#endif<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX2 */<br> =C2=A0+#define HAVE_AVX2 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512BW */<br> =C2=A0+#define HAVE_AVX512BW 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512CD */<br> =C2=A0+#define HAVE_AVX512CD 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512DQ */<br> =C2=A0+#define HAVE_AVX512DQ 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512ER */<br> =C2=A0+#define HAVE_AVX512ER 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512F */<br> =C2=A0+#define HAVE_AVX512F 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512IFMA */<br> =C2=A0+#define HAVE_AVX512IFMA 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512PF */<br> =C2=A0+#define HAVE_AVX512PF 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512VBMI */<br> =C2=A0+#define HAVE_AVX512VBMI 1<br> =C2=A0+<br> =C2=A0+/* Define if host toolchain supports AVX512VL */<br> =C2=A0+#define HAVE_AVX512VL 1<br> =C2=A0+#endif<br> =C2=A0+<br> ++/* backtrace() is available */<br> ++/* #undef HAVE_BACKTRACE */<br> ++<br> =C2=A0+/* bdevname() is available */<br> =C2=A0+/* #undef HAVE_BDEVNAME */<br> =C2=A0+<br> =C2=A0+/* bdev_check_media_change() exists */<br> =C2=A0+/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */<br> =C2=A0+<br> =C2=A0+/* bdev_file_open_by_path() exists */<br> =C2=A0+/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */<br> =C2=A0+<br> =C2=A0+/* bdev_*_io_acct() available */<br> =C2=A0+/* #undef HAVE_BDEV_IO_ACCT_63 */<br> =C2=A0+<br> =C2=A0+/* bdev_*_io_acct() available */<br> =C2=A0+/* #undef HAVE_BDEV_IO_ACCT_OLD */<br> =C2=A0+<br> =C2=A0+/* bdev_kobj() exists */<br> =C2=A0+/* #undef HAVE_BDEV_KOBJ */<br> =C2=A0+<br> =C2=A0+/* bdev_max_discard_sectors() is available */<br> =C2=A0+/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */<br> =C2=A0+<br> =C2=A0+/* bdev_max_secure_erase_sectors() is available */<br> =C2=A0+/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */<br> =C2=A0+<br> =C2=A0+/* bdev_open_by_path() exists */<br> =C2=A0+/* #undef HAVE_BDEV_OPEN_BY_PATH */<br> =C2=A0+<br> =C2=A0+/* bdev_release() exists */<br> =C2=A0+/* #undef HAVE_BDEV_RELEASE */<br> =C2=A0+<br> =C2=A0+/* block_device_operations->submit_bio() returns void */<br> =C2=A0+/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */<br> =C2=A0+<br> =C2=A0+/* bdev_whole() is available */<br> =C2=A0+/* #undef HAVE_BDEV_WHOLE */<br> =C2=A0+<br> =C2=A0+/* bio_alloc() takes 4 arguments */<br> =C2=A0+/* #undef HAVE_BIO_ALLOC_4ARG */<br> =C2=A0+<br> =C2=A0+/* bio->bi_bdev->bd_disk exists */<br> =C2=A0+/* #undef HAVE_BIO_BDEV_DISK */<br> =C2=A0+<br> =C2=A0+/* bio->bi_opf is defined */<br> =C2=A0+/* #undef HAVE_BIO_BI_OPF */<br> =C2=A0+<br> =C2=A0+/* bio->bi_status exists */<br> =C2=A0+/* #undef HAVE_BIO_BI_STATUS */<br> =C2=A0+<br> =C2=A0+/* bio has bi_iter */<br> =C2=A0+/* #undef HAVE_BIO_BVEC_ITER */<br> =C2=A0+<br> =C2=A0+/* bio_*_io_acct() available */<br> =C2=A0+/* #undef HAVE_BIO_IO_ACCT */<br> =C2=A0+<br> =C2=A0+/* bio_max_segs() is implemented */<br> =C2=A0+/* #undef HAVE_BIO_MAX_SEGS */<br> =C2=A0+<br> =C2=A0+/* bio_set_dev() is available */<br> =C2=A0+/* #undef HAVE_BIO_SET_DEV */<br> =C2=A0+<br> =C2=A0+/* bio_set_dev() GPL-only */<br> =C2=A0+/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */<br> =C2=A0+<br> =C2=A0+/* bio_set_dev() is a macro */<br> =C2=A0+/* #undef HAVE_BIO_SET_DEV_MACRO */<br> =C2=A0+<br> =C2=A0+/* bio_set_op_attrs is available */<br> =C2=A0+/* #undef HAVE_BIO_SET_OP_ATTRS */<br> =C2=A0+<br> =C2=A0+/* blkdev_get_by_path() exists and takes 4 args */<br> =C2=A0+/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */<br> =C2=A0+<br> =C2=A0+/* blkdev_get_by_path() handles ERESTARTSYS */<br> =C2=A0+/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */<br> =C2=A0+<br> =C2=A0+/* __blkdev_issue_discard(flags) is available */<br> =C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */<br> =C2=A0+<br> =C2=A0+/* __blkdev_issue_discard() is available */<br> =C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */<br> =C2=A0+<br> =C2=A0+/* blkdev_issue_discard(flags) is available */<br> =C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */<br> =C2=A0+<br> =C2=A0+/* blkdev_issue_discard() is available */<br> =C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */<br> =C2=A0+<br> =C2=A0+/* blkdev_issue_secure_erase() is available */<br> =C2=A0+/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */<br> =C2=A0+<br> =C2=A0+/* blkdev_put() exists */<br> =C2=A0+/* #undef HAVE_BLKDEV_PUT */<br> =C2=A0+<br> =C2=A0+/* blkdev_put() accepts void* as arg 2 */<br> =C2=A0+/* #undef HAVE_BLKDEV_PUT_HOLDER */<br> =C2=A0+<br> =C2=A0+/* blkdev_reread_part() exists */<br> =C2=A0+/* #undef HAVE_BLKDEV_REREAD_PART */<br> =C2=A0+<br> =C2=A0+/* blkg_tryget() is available */<br> =C2=A0+/* #undef HAVE_BLKG_TRYGET */<br> =C2=A0+<br> =C2=A0+/* blkg_tryget() GPL-only */<br> =C2=A0+/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */<br> =C2=A0+<br> =C2=A0+/* blk_alloc_disk() exists */<br> =C2=A0+/* #undef HAVE_BLK_ALLOC_DISK */<br> =C2=A0+<br> =C2=A0+/* blk_alloc_disk() exists and takes 2 args */<br> =C2=A0+/* #undef HAVE_BLK_ALLOC_DISK_2ARG */<br> =C2=A0+<br> =C2=A0+/* blk_alloc_queue() expects request function */<br> =C2=A0+/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */<br> =C2=A0+<br> =C2=A0+/* blk_alloc_queue_rh() expects request function */<br> =C2=A0+/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */<br> =C2=A0+<br> =C2=A0+/* blk_cleanup_disk() exists */<br> =C2=A0+/* #undef HAVE_BLK_CLEANUP_DISK */<br> =C2=A0+<br> =C2=A0+/* blk_mode_t is defined */<br> =C2=A0+/* #undef HAVE_BLK_MODE_T */<br> =C2=A0+<br> =C2=A0+/* block multiqueue is available */<br> =C2=A0+/* #undef HAVE_BLK_MQ */<br> =C2=A0+<br> =C2=A0+/* block multiqueue hardware context is cached in struct request */<= br> =C2=A0+/* #undef HAVE_BLK_MQ_RQ_HCTX */<br> =C2=A0+<br> =C2=A0+/* blk queue backing_dev_info is dynamic */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */<br> =C2=A0+<br> =C2=A0+/* blk_queue_discard() is available */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_DISCARD */<br> =C2=A0+<br> =C2=A0+/* blk_queue_flag_clear() exists */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */<br> =C2=A0+<br> =C2=A0+/* blk_queue_flag_set() exists */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_FLAG_SET */<br> =C2=A0+<br> =C2=A0+/* blk_queue_flush() is available */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_FLUSH */<br> =C2=A0+<br> =C2=A0+/* blk_queue_flush() is GPL-only */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */<br> =C2=A0+<br> =C2=A0+/* blk_queue_secdiscard() is available */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_SECDISCARD */<br> =C2=A0+<br> =C2=A0+/* blk_queue_secure_erase() is available */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */<br> =C2=A0+<br> =C2=A0+/* blk_queue_update_readahead() exists */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */<br> =C2=A0+<br> =C2=A0+/* blk_queue_write_cache() exists */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */<br> =C2=A0+<br> =C2=A0+/* blk_queue_write_cache() is GPL-only */<br> =C2=A0+/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */<br> =C2=A0+<br> =C2=A0+/* BLK_STS_RESV_CONFLICT is defined */<br> =C2=A0+/* #undef HAVE_BLK_STS_RESV_CONFLICT */<br> =C2=A0+<br> =C2=A0+/* Define if release() in block_device_operations takes 1 arg */<br> =C2=A0+/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */<br> =C2=A0+<br> =C2=A0+/* Define if revalidate_disk() in block_device_operations */<br> =C2=A0+/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent= in the<br> =C2=A0+=C2=A0 =C2=A0CoreFoundation framework. */<br> =C2=A0+/* #undef HAVE_CFLOCALECOPYCURRENT */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the Mac OS X function<br> =C2=A0+=C2=A0 =C2=A0CFLocaleCopyPreferredLanguages in the CoreFoundation fr= amework. */<br> =C2=A0+/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAp= pValue in<br> =C2=A0+=C2=A0 =C2=A0the CoreFoundation framework. */<br> =C2=A0+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */<br> =C2=A0+<br> =C2=A0+/* check_disk_change() exists */<br> =C2=A0+/* #undef HAVE_CHECK_DISK_CHANGE */<br> =C2=A0+<br> =C2=A0+/* clear_inode() is available */<br> =C2=A0+/* #undef HAVE_CLEAR_INODE */<br> =C2=A0+<br> =C2=A0+/* dentry uses const struct dentry_operations */<br> =C2=A0+/* #undef HAVE_CONST_DENTRY_OPERATIONS */<br> =C2=A0+<br> =C2=A0+/* copy_from_iter() is available */<br> =C2=A0+/* #undef HAVE_COPY_FROM_ITER */<br> =C2=A0+<br> =C2=A0+/* copy_splice_read exists */<br> =C2=A0+/* #undef HAVE_COPY_SPLICE_READ */<br> =C2=A0+<br> =C2=A0+/* copy_to_iter() is available */<br> =C2=A0+/* #undef HAVE_COPY_TO_ITER */<br> =C2=A0+<br> =C2=A0+/* cpu_has_feature() is GPL-only */<br> =C2=A0+/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */<br> =C2=A0+<br> =C2=A0+/* yes */<br> =C2=A0+/* #undef HAVE_CPU_HOTPLUG */<br> =C2=A0+<br> =C2=A0+/* current_time() exists */<br> =C2=A0+/* #undef HAVE_CURRENT_TIME */<br> =C2=A0+<br> =C2=A0+/* Define if the GNU dcgettext() function is already present or prei= nstalled.<br> =C2=A0+=C2=A0 =C2=A0*/<br> =C2=A0+/* #undef HAVE_DCGETTEXT */<br> =C2=A0+<br> =C2=A0+/* DECLARE_EVENT_CLASS() is available */<br> =C2=A0+/* #undef HAVE_DECLARE_EVENT_CLASS */<br> =C2=A0+<br> =C2=A0+/* dentry aliases are in d_u member */<br> =C2=A0+/* #undef HAVE_DENTRY_D_U_ALIASES */<br> =C2=A0+<br> =C2=A0+/* dequeue_signal() takes 4 arguments */<br> =C2=A0+/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */<br> =C2=A0+<br> =C2=A0+/* lookup_bdev() wants dev_t arg */<br> =C2=A0+/* #undef HAVE_DEVT_LOOKUP_BDEV */<br> =C2=A0+<br> =C2=A0+/* sops->dirty_inode() wants flags */<br> =C2=A0+/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */<br> =C2=A0+<br> =C2=A0+/* disk_check_media_change() exists */<br> =C2=A0+/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */<br> =C2=A0+<br> =C2=A0+/* disk_*_io_acct() available */<br> =C2=A0+/* #undef HAVE_DISK_IO_ACCT */<br> =C2=A0+<br> =C2=A0+/* disk_update_readahead() exists */<br> =C2=A0+/* #undef HAVE_DISK_UPDATE_READAHEAD */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the <dlfcn.h> header file. */<br> =C2=A0+#define HAVE_DLFCN_H 1<br> =C2=A0+<br> =C2=A0+/* d_make_root() is available */<br> =C2=A0+/* #undef HAVE_D_MAKE_ROOT */<br> =C2=A0+<br> =C2=A0+/* d_prune_aliases() is available */<br> =C2=A0+/* #undef HAVE_D_PRUNE_ALIASES */<br> =C2=A0+<br> =C2=A0+/* dops->d_revalidate() operation takes nameidata */<br> =C2=A0+/* #undef HAVE_D_REVALIDATE_NAMEIDATA */<br> =C2=A0+<br> =C2=A0+/* eops->encode_fh() wants child and parent inodes */<br> =C2=A0+/* #undef HAVE_ENCODE_FH_WITH_INODE */<br> =C2=A0+<br> =C2=A0+/* sops->evict_inode() exists */<br> =C2=A0+/* #undef HAVE_EVICT_INODE */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the 'execvpe' function. */<br> =C2=A0+#define HAVE_EXECVPE 1<br> =C2=A0+<br> =C2=A0+/* FALLOC_FL_ZERO_RANGE is defined */<br> =C2=A0+/* #undef HAVE_FALLOC_FL_ZERO_RANGE */<br> =C2=A0+<br> =C2=A0+/* fault_in_iov_iter_readable() is available */<br> =C2=A0+/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */<br> =C2=A0+<br> =C2=A0+/* filemap_range_has_page() is available */<br> =C2=A0+/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */<br> =C2=A0+<br> =C2=A0+/* fops->aio_fsync() exists */<br> =C2=A0+/* #undef HAVE_FILE_AIO_FSYNC */<br> =C2=A0+<br> =C2=A0+/* file_dentry() is available */<br> =C2=A0+/* #undef HAVE_FILE_DENTRY */<br> =C2=A0+<br> =C2=A0+/* fops->fadvise() exists */<br> =C2=A0+/* #undef HAVE_FILE_FADVISE */<br> =C2=A0+<br> =C2=A0+/* file_inode() is available */<br> =C2=A0+/* #undef HAVE_FILE_INODE */<br> =C2=A0+<br> =C2=A0+/* flush_dcache_page() is GPL-only */<br> =C2=A0+/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */<br> =C2=A0+<br> =C2=A0+/* iops->follow_link() cookie */<br> =C2=A0+/* #undef HAVE_FOLLOW_LINK_COOKIE */<br> =C2=A0+<br> =C2=A0+/* iops->follow_link() nameidata */<br> =C2=A0+/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */<br> =C2=A0+<br> =C2=A0+/* Define if compiler supports -Wformat-overflow */<br> =C2=A0+/* #undef HAVE_FORMAT_OVERFLOW */<br> =C2=A0+<br> =C2=A0+/* fsync_bdev() is declared in include/blkdev.h */<br> =C2=A0+/* #undef HAVE_FSYNC_BDEV */<br> =C2=A0+<br> =C2=A0+/* fops->fsync() with range */<br> =C2=A0+/* #undef HAVE_FSYNC_RANGE */<br> =C2=A0+<br> =C2=A0+/* fops->fsync() without dentry */<br> =C2=A0+/* #undef HAVE_FSYNC_WITHOUT_DENTRY */<br> =C2=A0+<br> =C2=A0+/* yes */<br> =C2=A0+/* #undef HAVE_GENERIC_FADVISE */<br> =C2=A0+<br> =C2=A0+/* generic_fillattr requires struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_GENERIC_FILLATTR_IDMAP */<br> =C2=A0+<br> =C2=A0+/* generic_fillattr requires struct mnt_idmap* and u32 request_mask = */<br> =C2=A0+/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */<br> =C2=A0+<br> =C2=A0+/* generic_fillattr requires struct user_namespace* */<br> =C2=A0+/* #undef HAVE_GENERIC_FILLATTR_USERNS */<br> =C2=A0+<br> =C2=A0+/* generic_*_io_acct() 3 arg available */<br> =C2=A0+/* #undef HAVE_GENERIC_IO_ACCT_3ARG */<br> =C2=A0+<br> =C2=A0+/* generic_*_io_acct() 4 arg available */<br> =C2=A0+/* #undef HAVE_GENERIC_IO_ACCT_4ARG */<br> =C2=A0+<br> =C2=A0+/* generic_readlink is global */<br> =C2=A0+/* #undef HAVE_GENERIC_READLINK */<br> =C2=A0+<br> =C2=A0+/* generic_setxattr() exists */<br> =C2=A0+/* #undef HAVE_GENERIC_SETXATTR */<br> =C2=A0+<br> =C2=A0+/* generic_write_checks() takes kiocb */<br> =C2=A0+/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */<br> =C2=A0+<br> =C2=A0+/* Define if the GNU gettext() function is already present or preins= talled. */<br> =C2=A0+/* #undef HAVE_GETTEXT */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the 'gettid' function. */<br> =C2=A0+/* #undef HAVE_GETTID */<br> =C2=A0+<br> =C2=A0+/* iops->get_acl() exists */<br> =C2=A0+/* #undef HAVE_GET_ACL */<br> =C2=A0+<br> =C2=A0+/* iops->get_acl() takes rcu */<br> =C2=A0+/* #undef HAVE_GET_ACL_RCU */<br> =C2=A0+<br> =C2=A0+/* has iops->get_inode_acl() */<br> =C2=A0+/* #undef HAVE_GET_INODE_ACL */<br> =C2=A0+<br> =C2=A0+/* iops->get_link() cookie */<br> =C2=A0+/* #undef HAVE_GET_LINK_COOKIE */<br> =C2=A0+<br> =C2=A0+/* iops->get_link() delayed */<br> =C2=A0+/* #undef HAVE_GET_LINK_DELAYED */<br> =C2=A0+<br> =C2=A0+/* group_info->gid exists */<br> =C2=A0+/* #undef HAVE_GROUP_INFO_GID */<br> =C2=A0+<br> =C2=A0+/* has_capability() is available */<br> =C2=A0+/* #undef HAVE_HAS_CAPABILITY */<br> =C2=A0+<br> =C2=A0+/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */<br> =C2=A0+/* #undef HAVE_IATTR_VFSID */<br> =C2=A0+<br> =C2=A0+/* Define if you have the iconv() function and it works. */<br> =C2=A0+#define HAVE_ICONV 1<br> =C2=A0+<br> =C2=A0+/* iops->getattr() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IDMAP_IOPS_GETATTR */<br> =C2=A0+<br> =C2=A0+/* iops->setattr() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IDMAP_IOPS_SETATTR */<br> =C2=A0+<br> =C2=A0+/* APIs for idmapped mount are present */<br> =C2=A0+/* #undef HAVE_IDMAP_MNT_API */<br> =C2=A0+<br> =C2=A0+/* mnt_idmap does not have user_namespace */<br> =C2=A0+/* #undef HAVE_IDMAP_NO_USERNS */<br> =C2=A0+<br> =C2=A0+/* Define if compiler supports -Wimplicit-fallthrough */<br> =C2=A0+/* #undef HAVE_IMPLICIT_FALLTHROUGH */<br> =C2=A0+<br> =C2=A0+/* Define if compiler supports -Winfinite-recursion */<br> =C2=A0+/* #undef HAVE_INFINITE_RECURSION */<br> =C2=A0+<br> =C2=A0+/* inode_get_atime() exists in linux/fs.h */<br> =C2=A0+/* #undef HAVE_INODE_GET_ATIME */<br> =C2=A0+<br> =C2=A0+/* inode_get_ctime() exists in linux/fs.h */<br> =C2=A0+/* #undef HAVE_INODE_GET_CTIME */<br> =C2=A0+<br> =C2=A0+/* inode_get_mtime() exists in linux/fs.h */<br> =C2=A0+/* #undef HAVE_INODE_GET_MTIME */<br> =C2=A0+<br> =C2=A0+/* yes */<br> =C2=A0+/* #undef HAVE_INODE_LOCK_SHARED */<br> =C2=A0+<br> =C2=A0+/* inode_owner_or_capable() exists */<br> =C2=A0+/* #undef HAVE_INODE_OWNER_OR_CAPABLE */<br> =C2=A0+<br> =C2=A0+/* inode_owner_or_capable() takes mnt_idmap */<br> =C2=A0+/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */<br> =C2=A0+<br> =C2=A0+/* inode_owner_or_capable() takes user_ns */<br> =C2=A0+/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */<br> =C2=A0+<br> =C2=A0+/* inode_set_atime_to_ts() exists in linux/fs.h */<br> =C2=A0+/* #undef HAVE_INODE_SET_ATIME_TO_TS */<br> =C2=A0+<br> =C2=A0+/* inode_set_ctime_to_ts() exists in linux/fs.h */<br> =C2=A0+/* #undef HAVE_INODE_SET_CTIME_TO_TS */<br> =C2=A0+<br> =C2=A0+/* inode_set_flags() exists */<br> =C2=A0+/* #undef HAVE_INODE_SET_FLAGS */<br> =C2=A0+<br> =C2=A0+/* inode_set_iversion() exists */<br> =C2=A0+/* #undef HAVE_INODE_SET_IVERSION */<br> =C2=A0+<br> =C2=A0+/* inode_set_mtime_to_ts() exists in linux/fs.h */<br> =C2=A0+/* #undef HAVE_INODE_SET_MTIME_TO_TS */<br> =C2=A0+<br> =C2=A0+/* inode->i_*time's are timespec64 */<br> =C2=A0+/* #undef HAVE_INODE_TIMESPEC64_TIMES */<br> =C2=A0+<br> =C2=A0+/* timestamp_truncate() exists */<br> =C2=A0+/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the <inttypes.h> header file. */<br= > =C2=A0+#define HAVE_INTTYPES_H 1<br> =C2=A0+<br> =C2=A0+/* in_compat_syscall() is available */<br> =C2=A0+/* #undef HAVE_IN_COMPAT_SYSCALL */<br> =C2=A0+<br> =C2=A0+/* iops->create() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IOPS_CREATE_IDMAP */<br> =C2=A0+<br> =C2=A0+/* iops->create() takes struct user_namespace* */<br> =C2=A0+/* #undef HAVE_IOPS_CREATE_USERNS */<br> =C2=A0+<br> =C2=A0+/* iops->mkdir() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IOPS_MKDIR_IDMAP */<br> =C2=A0+<br> =C2=A0+/* iops->mkdir() takes struct user_namespace* */<br> =C2=A0+/* #undef HAVE_IOPS_MKDIR_USERNS */<br> =C2=A0+<br> =C2=A0+/* iops->mknod() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IOPS_MKNOD_IDMAP */<br> =C2=A0+<br> =C2=A0+/* iops->mknod() takes struct user_namespace* */<br> =C2=A0+/* #undef HAVE_IOPS_MKNOD_USERNS */<br> =C2=A0+<br> =C2=A0+/* iops->permission() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IOPS_PERMISSION_IDMAP */<br> =C2=A0+<br> =C2=A0+/* iops->permission() takes struct user_namespace* */<br> =C2=A0+/* #undef HAVE_IOPS_PERMISSION_USERNS */<br> =C2=A0+<br> =C2=A0+/* iops->rename() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IOPS_RENAME_IDMAP */<br> =C2=A0+<br> =C2=A0+/* iops->rename() takes struct user_namespace* */<br> =C2=A0+/* #undef HAVE_IOPS_RENAME_USERNS */<br> =C2=A0+<br> =C2=A0+/* iops->setattr() exists */<br> =C2=A0+/* #undef HAVE_IOPS_SETATTR */<br> =C2=A0+<br> =C2=A0+/* iops->symlink() takes struct mnt_idmap* */<br> =C2=A0+/* #undef HAVE_IOPS_SYMLINK_IDMAP */<br> =C2=A0+<br> =C2=A0+/* iops->symlink() takes struct user_namespace* */<br> =C2=A0+/* #undef HAVE_IOPS_SYMLINK_USERNS */<br> =C2=A0+<br> =C2=A0+/* iov_iter_advance() is available */<br> =C2=A0+/* #undef HAVE_IOV_ITER_ADVANCE */<br> =C2=A0+<br> =C2=A0+/* iov_iter_count() is available */<br> =C2=A0+/* #undef HAVE_IOV_ITER_COUNT */<br> =C2=A0+<br> =C2=A0+/* iov_iter_fault_in_readable() is available */<br> =C2=A0+/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */<br> =C2=A0+<br> =C2=A0+/* iov_iter_revert() is available */<br> =C2=A0+/* #undef HAVE_IOV_ITER_REVERT */<br> =C2=A0+<br> =C2=A0+/* iov_iter_type() is available */<br> =C2=A0+/* #undef HAVE_IOV_ITER_TYPE */<br> =C2=A0+<br> =C2=A0+/* iov_iter types are available */<br> =C2=A0+/* #undef HAVE_IOV_ITER_TYPES */<br> =C2=A0+<br> =C2=A0+/* yes */<br> =C2=A0+/* #undef HAVE_IO_SCHEDULE_TIMEOUT */<br> =C2=A0+<br> =C2=A0+/* Define to 1 if you have the 'issetugid' function. */<br> =C2=A0+#define HAVE_ISSETUGID 1<br> =C2=A0+<br> =C2=A0+/* iter_iov() is available */<br> =C2=A0+/* #undef HAVE_ITER_IOV */<br> =C2=A0+<br> =C2=A0+/* kernel has kernel_fpu_* functions */<br> =C2=A0+/* #undef HAVE_KERNEL_FPU */<br> =C2=A0+<br> =C2=A0+/* kernel has asm/fpu/api.h */<br> =C2=A0+/* #undef HAVE_KERNEL_FPU_API_HEADER */<br> =C2=A0+<br> =C2=A0+/* kernel fpu internal */<br> =C2=A0+/* #undef HAVE_KERNEL_FPU_INTERNAL */<br> =C2=A0+<br> =C2=A0+/* kernel has asm/fpu/internal.h */<br> =C2=A0+/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */<br> =C2=A0+<br> =C2=A0+/* uncached_acl_sentinel() exists */<br> =C2=A0+/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */<br> =C2=A0+<br> =C2=A0+/* Define if compiler supports -Winfinite-recursion */<br> =C2=A0+/* #undef HAVE_KERNEL_INFINITE_RECURSION */<br> =C2=A0+<br> ++/* kernel defines intptr_t */<br> ++/* #undef HAVE_KERNEL_INTPTR_T */<br> ++<br> =C2=A0+/* kernel has kernel_neon_* functions */<br> =C2=A0+/* #undef HAVE_KERNEL_NEON */<br> =C2=A0+<br> =C2=A0+/* kernel does stack verification */<br> =C2=A0+/* #undef HAVE_KERNEL_OBJTOOL */<br> =C2=A0+<br> =C2=A0+/* kernel has linux/objtool.h */<br> =C2=A0+/* #undef HAVE_KERNEL_OBJTOOL_HEADER */<br> =C2=A0+<br> =C2=A0+/* kernel_read() take loff_t pointer */<br> =C2=A0+/* #undef HAVE_KERNEL_READ_PPOS */<br> =C2=A0+<br> =C2=A0+/* strlcpy() exists */<br> =C2=A0+/* #undef HAVE_KERNEL_STRLCPY */<br> =C2=A0+<br> =C2=A0+/* strscpy() exists */<br> =C2=A0+/* #undef HAVE_KERNEL_STRSCPY */<br> =C2=A0+<br> =C2=A0+/* timer_list.function gets a timer_list */<br> =C2=A0+/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */<br> =C2=A0+<br> =C2=A0+/* struct timer_list has a flags member */<br> =C2=A0+/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */<br> =C2=A0+<br> =C2=A0+/* timer_setup() is available */<br> =C2=A0+/* #undef HAVE_KERNEL_TIMER_SETUP */<br> =C2=A0+<br> =C2=A0+/* kernel_write() take loff_t pointer */<br> =C2=A0+/* #undef HAVE_KERNEL_WRITE_PPOS */<br> =C2=A0+<br> =C2=A0+/* kmem_cache_create_usercopy() exists */<br> =C2=A0+/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */<br> =C2=A0+<br> =C2=A0+/* kstrtoul() exists */<br> =C2=A0+/* #undef HAVE_KSTRTOUL */<br> =C2=A0+<br> =C2=A0+/* ktime_get_coarse_real_ts64() exists */<br> =C2=A0+/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */<br> =C2=A0+<br> =C2=A0+/* ktime_get_raw_ts64() exists */<br> =C2=A0+/* #undef HAVE_KTIME_GET_RAW_TS64 */<br> =C2=A0+<br> =C2=A0+/* kvmalloc exists */<br> =C2=A0+/* #undef HAVE_KVMALLOC */<br> =C2=A0+<br> =C2=A0+/* Define if you have [aio] */<br> =C2=A0+/* #undef HAVE_LIBAIO */<br> =C2=A0+<br> =C2=A0+/* Define if you have [blkid] */<br> =C2=A0+/* #undef HAVE_LIBBLKID */<br> =C2=A0+<br> =C2=A0+/* Define if you have [crypto] */<br> =C2=A0+#define HAVE_LIBCRYPTO 1<br> =C2=A0+<br> =C2=A0+/* Define if you have [tirpc] */<br> =C2=A0+/* #undef HAVE_LIBTIRPC */<br> =C2=A0+<br> =C2=A0+/* Define if you have [udev] */<br> =C2=A0+/* #undef HAVE_LIBUDEV */<br> =C2=A0+<br> =C2=A0+/* Define if you have [unwind] */<br> =C2=A0+/* #undef HAVE_LIBUNWIND */<br> =C2=A0+<br> =C2=A0+/* libunwind has unw_get_elf_filename */<br> =C2=A0+/* #undef HAVE_LIBUNWIND_ELF */<br> =C2=A0+<br> =C2=A0+/* Define if you have [uuid] */<br> =C2=A0+/* #undef HAVE_LIBUUID */<br> =C2=A0+<br> =C2=A0+/* linux/blk-cgroup.h exists */<br> =C2=A0+/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */<br> =C2=A0+<br> =C2=A0+/* lseek_execute() is available */<br> =C2=A0+/* #undef HAVE_LSEEK_EXECUTE */<br> =C2=A0+<br> =C2=A0+/* makedev() is declared in sys/mkdev.h */<br> =C2=A0+/* #undef HAVE_MAKEDEV_IN_MKDEV */<br> =C2=A0+<br> =C2=A0+/* makedev() is declared in sys/sysmacros.h */<br> =C2=A0+/* #undef HAVE_MAKEDEV_IN_SYSMACROS */<br> =C2=A0+<br> =C2=A0+/* Noting that make_request_fn() returns blk_qc_t */<br> =C2=A0+/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */<br> =C2=A0+<br> =C2=A0+/* Noting that make_request_fn() returns void */<br> *** 552 LINES SKIPPED ***<br> </blockquote></div> --0000000000006990d20619c5a9d5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpF8uGn5A-S3ebYJ7f9hVq5aibJ750515iqZCta6oe9oQ>