Date: Sat, 10 Jul 2021 15:44:47 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: 476ef25d321c - main - zfs: update zfs_config.h to match current OpenZFS version (bdd11cbb9) Message-ID: <202107101544.16AFilLn067844@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=476ef25d321c4eb9fffe91265a03960983332bc2 commit 476ef25d321c4eb9fffe91265a03960983332bc2 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2021-07-10 14:46:21 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2021-07-10 15:43:16 +0000 zfs: update zfs_config.h to match current OpenZFS version (bdd11cbb9) TBD: build with fetch(3) support for keylocation=http(s):// --- sys/modules/zfs/zfs_config.h | 92 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 10 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 9c7c76fac70f..ddb2527e56fd 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -88,6 +88,9 @@ /* 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 */ @@ -100,6 +103,9 @@ /* 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 */ @@ -151,6 +157,9 @@ /* 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 */ @@ -197,6 +206,9 @@ /* sops->dirty_inode() wants flags */ /* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 @@ -236,6 +248,9 @@ /* 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 */ @@ -272,6 +287,12 @@ /* 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 */ @@ -290,6 +311,21 @@ /* 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 */ @@ -299,12 +335,6 @@ /* iov_iter_fault_in_readable() is available */ /* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ -/* iov_iter_init() is available */ -/* #undef HAVE_IOV_ITER_INIT */ - -/* iov_iter_init() is available */ -/* #undef HAVE_IOV_ITER_INIT_LEGACY */ - /* iov_iter_revert() is available */ /* #undef HAVE_IOV_ITER_REVERT */ @@ -404,7 +434,7 @@ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 -/* iops->create()/mkdir()/mknod() take umode_t */ +/* iops->mkdir() takes umode_t */ /* #undef HAVE_MKDIR_UMODE_T */ /* Define to 1 if you have the `mlockall' function. */ @@ -425,6 +455,9 @@ /* 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 */ @@ -500,18 +533,33 @@ /* Define to 1 if you have the <security/pam_modules.h> header file. */ #define HAVE_SECURITY_PAM_MODULES_H 1 -/* setattr_prepare() is available */ -/* #undef HAVE_SETATTR_PREPARE */ +/* 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 */ +/* 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 */ @@ -577,6 +625,9 @@ /* i_op->tmpfile() exists */ /* #undef HAVE_TMPFILE */ +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + /* totalhigh_pages() exists */ /* #undef HAVE_TOTALHIGH_PAGES */ @@ -592,6 +643,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + /* iops->getattr() takes a vfsmount */ /* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ @@ -664,6 +718,9 @@ /* xattr_handler->set() wants xattr_handler */ /* #undef HAVE_XATTR_SET_HANDLER */ +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + /* Define if you have [z] */ #define HAVE_ZLIB 1 @@ -673,6 +730,21 @@ /* kernel exports FPU functions */ /* #undef KERNEL_EXPORTS_X86_FPU */ +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107101544.16AFilLn067844>