aboutsummaryrefslogtreecommitdiff
path: root/sys/modules/zfs
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2024-10-11 06:39:18 +0000
committerMartin Matuska <mm@FreeBSD.org>2024-10-11 06:43:49 +0000
commit7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 (patch)
tree5bae8128eb32510f0477afd24ab5f3bc7babe1f3 /sys/modules/zfs
parent3e501ef896671cb190e8c40c6258b8f27d136f07 (diff)
parent3a9fca901b4463760001644b83da60bf14f7b554 (diff)
zfs: merge openzfs/zfs@b10992582
Notable upstream pull request merges: #9416 -multiple zio_compress: introduce max size threshold #10018 a10e552b9 Adding Direct IO Support #15147 e419a63bf xattr dataset prop: change defaults to sa #15454 7e957fde7 send/recv: open up additional stream feature flags #15810 0d77e738e Defer resilver only when progress is above a threshold #15921 3cf2bfa57 Allocate zap_attribute_t from kmem instead of stack #16483 -multiple dmu_objset: replace dnode_hash impl with cityhash4 #16485 8be2f4c3d zio_resume: log when unsuspending the pool #16491 88433e640 sys/types32.h: Remove struct timeval32 from libspl header #16496 f245541e2 zfs_file: implement zfs_file_deallocate for FreeBSD 14 #16511 308f7c2f1 Fix an uninitialized data access #16529 29c9e6c32 Fix handling of DNS names with '-' in them for sharenfs #16531 ddf5f34f0 Avoid fault diagnosis if multiple vdevs have errors #16539 6f50f8e16 zfs_log: add flex array fields to log record structs #16546 d40d40913 Evicting too many bytes from MFU metadata #16551 3014dcb76 Reduce and handle EAGAIN errors on AIO label reads #16554 80645d658 FreeBSD: restore zfs_znode_update_vfs() #16565 832f66b21 FreeBSD: Sync taskq_cancel_id() returns with Linux #16567 48d1be254 Properly release key in spa_keystore_dsl_key_hold_dd() #16569 141368a4b Restrict raidz faulted vdev count #16583 c84a37ae9 lua: add flex array field to TString type #16584 86737c592 Avoid computing strlen() inside loops #16587 d34d4f97a snapdir: add 'disabled' value to make .zfs inaccessible #16593 224393a32 feature: large_microzap #16597 412105977 Temporarily disable Direct IO by default #16605 4ebe674d9 ARC: Cache arc_c value during arc_evict() Backported pull request merges: #16613 ab777f436 Return boolean_t in inline functions of lib/libspl/include/sys/uio.h #16616 efeb60b86 FreeBSD: ignore some includes when not building kernel #16635 ---TBD--- zdb: fix printf format in dump_zap() Obtained from: OpenZFS OpenZFS commit: b109925820fb79db3e37670c159977f03edd950f OpenZFS tag: 2.3.0-rc1
Diffstat (limited to 'sys/modules/zfs')
-rw-r--r--sys/modules/zfs/Makefile4
-rw-r--r--sys/modules/zfs/zfs_config.h474
-rw-r--r--sys/modules/zfs/zfs_gitrev.h2
3 files changed, 34 insertions, 446 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 7fba05b962ce..9573686b614c 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -197,7 +197,7 @@ SRCS+= abd_os.c \
zfs_racct.c \
zfs_vfsops.c \
zfs_vnops_os.c \
- zfs_znode.c \
+ zfs_znode_os.c \
zio_crypt.c \
zvol_os.c
@@ -242,6 +242,7 @@ SRCS+= abd.c \
ddt_stats.c \
ddt_zap.c \
dmu.c \
+ dmu_direct.c \
dmu_diff.c \
dmu_object.c \
dmu_objset.c \
@@ -343,6 +344,7 @@ SRCS+= abd.c \
zfs_rlock.c \
zfs_sa.c \
zfs_vnops.c \
+ zfs_znode.c \
zil.c \
zio.c \
zio_checksum.c \
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 2edd53c4001d..5dc43281242f 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -8,39 +8,15 @@
language is requested. */
/* #undef ENABLE_NLS */
-/* bio_end_io_t wants 1 arg */
-/* #undef HAVE_1ARG_BIO_END_IO_T */
+/* __assign_str() has one arg */
+/* #undef HAVE_1ARG_ASSIGN_STR */
/* 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 */
@@ -135,24 +111,12 @@
/* 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 */
@@ -219,9 +183,6 @@
/* 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 */
@@ -234,33 +195,12 @@
/* backing_dev_info is available through queue gendisk */
/* #undef HAVE_BLK_QUEUE_DISK_BDI */
-/* 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 */
@@ -270,45 +210,15 @@
/* 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 */
@@ -316,8 +226,8 @@
/* 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 a task argument */
+/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TASK */
/* dequeue_signal() takes 4 arguments */
/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */
@@ -325,9 +235,6 @@
/* 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 */
@@ -340,66 +247,24 @@
/* 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 */
+/* file->f_version exists */
+/* #undef HAVE_FILE_F_VERSION */
/* 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 */
@@ -412,20 +277,14 @@
/* 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 */
+/* GENHD_FL_EXT_DEVT flag is available */
+/* #undef HAVE_GENHD_FL_EXT_DEVT */
-/* generic_write_checks() takes kiocb */
-/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */
+/* GENHD_FL_NO_PART flag is available */
+/* #undef HAVE_GENHD_FL_NO_PART */
/* Define if the GNU gettext() function is already present or preinstalled. */
/* #undef HAVE_GETTEXT */
@@ -442,18 +301,6 @@
/* 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 */
@@ -487,9 +334,6 @@
/* 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 */
@@ -505,27 +349,15 @@
/* 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 */
@@ -556,36 +388,21 @@
/* 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_get_pages() is available */
+/* #undef HAVE_IOV_ITER_GET_PAGES */
-/* 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_get_pages2() is available */
+/* #undef HAVE_IOV_ITER_GET_PAGES2 */
/* 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
@@ -604,9 +421,6 @@
/* 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 */
@@ -622,45 +436,12 @@
/* 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 */
-
/* kernel has kmap_local_page */
/* #undef HAVE_KMAP_LOCAL_PAGE */
-/* 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 */
@@ -685,11 +466,8 @@
/* 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 */
+/* building against unsupported kernel version */
+/* #undef HAVE_LINUX_EXPERIMENTAL */
/* makedev() is declared in sys/mkdev.h */
/* #undef HAVE_MAKEDEV_IN_MKDEV */
@@ -700,30 +478,21 @@
/* 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 */
-
-/* iops->mkdir() takes umode_t */
-/* #undef HAVE_MKDIR_UMODE_T */
-
/* Define to 1 if you have the 'mlockall' function. */
#define HAVE_MLOCKALL 1
+/* PG_error flag is available */
+/* #undef HAVE_MM_PAGE_FLAG_ERROR */
+
/* page_mapping() is available */
/* #undef HAVE_MM_PAGE_MAPPING */
/* page_size() is available */
/* #undef HAVE_MM_PAGE_SIZE */
-/* 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 */
-
/* folio_wait_bit() exists */
/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */
@@ -736,42 +505,12 @@
/* 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_handler ctl_table arg is const */
/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */
/* 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"
@@ -790,48 +529,15 @@
/* register_sysctl_table exists */
/* #undef HAVE_REGISTER_SYSCTL_TABLE */
-/* iops->rename2() exists */
-/* #undef HAVE_RENAME2 */
-
-/* struct inode_operations_wrapper takes .rename2() */
-/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */
-
/* 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
@@ -844,9 +550,6 @@
/* 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, arg1 is struct mnt_idmap * */
/* #undef HAVE_SET_ACL_IDMAP_DENTRY */
@@ -856,30 +559,12 @@
/* iops->set_acl() takes 4 args, arg2 is struct dentry * */
/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */
-/* set_cached_acl() is usable */
-/* #undef HAVE_SET_CACHED_ACL_USABLE */
-
-/* set_special_state() exists */
-/* #undef HAVE_SET_SPECIAL_STATE */
-
/* shrinker_register exists */
/* #undef HAVE_SHRINKER_REGISTER */
-/* 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 */
-
-/* cs->count_objects exists */
-/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */
-
#if defined(__amd64__) || defined(__i386__)
/* Define if host toolchain supports SSE */
#define HAVE_SSE 1
@@ -936,12 +621,6 @@
/* have super_block s_shrink pointer */
/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */
-/* super_setup_bdi_name() exits */
-/* #undef HAVE_SUPER_SETUP_BDI_NAME */
-
-/* super_block->s_user_ns exists */
-/* #undef HAVE_SUPER_USER_NS */
-
/* sync_blockdev() is declared in include/blkdev.h */
/* #undef HAVE_SYNC_BLOCKDEV */
@@ -954,9 +633,6 @@
/* 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 */
-
/* i_op->tmpfile() uses old dentry signature */
/* #undef HAVE_TMPFILE_DENTRY */
@@ -987,42 +663,27 @@
/* iops->setattr() takes struct user_namespace* */
/* #undef HAVE_USERNS_IOPS_SETATTR */
-/* user_namespace->ns.inum exists */
-/* #undef HAVE_USER_NS_COMMON_INUM */
-
-/* iops->getattr() takes a vfsmount */
-/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */
-
/* fops->clone_file_range() is available */
/* #undef HAVE_VFS_CLONE_FILE_RANGE */
-/* fops->copy_file_range() is available */
-/* #undef HAVE_VFS_COPY_FILE_RANGE */
-
/* fops->dedupe_file_range() is available */
/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */
-/* aops->direct_IO() uses iovec */
-/* #undef HAVE_VFS_DIRECT_IO_IOVEC */
-
/* aops->direct_IO() uses iov_iter without rw */
/* #undef HAVE_VFS_DIRECT_IO_ITER */
/* aops->direct_IO() uses iov_iter with offset */
/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */
-/* aops->direct_IO() uses iov_iter with rw and offset */
-/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */
-
/* filemap_dirty_folio exists */
/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */
-/* file_operations_extend takes .copy_file_range() and .clone_file_range() */
-/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */
-
/* generic_copy_file_range() is available */
/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */
+/* invalidate_folio exists */
+/* #undef HAVE_VFS_INVALIDATE_FOLIO */
+
/* All required iov_iter interfaces are available */
/* #undef HAVE_VFS_IOV_ITER */
@@ -1041,12 +702,12 @@
/* read_folio exists */
/* #undef HAVE_VFS_READ_FOLIO */
+/* release_folio exists */
+/* #undef HAVE_VFS_RELEASE_FOLIO */
+
/* fops->remap_file_range() is available */
/* #undef HAVE_VFS_REMAP_FILE_RANGE */
-/* fops->read/write_iter() are available */
-/* #undef HAVE_VFS_RW_ITERATE */
-
/* __set_page_dirty_nobuffers exists */
/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */
@@ -1056,51 +717,15 @@
/* __vmalloc page flags exists */
/* #undef HAVE_VMALLOC_PAGE_KERNEL */
-/* yes */
-/* #undef HAVE_WAIT_ON_BIT_ACTION */
-
-/* wait_queue_entry_t exists */
-/* #undef HAVE_WAIT_QUEUE_ENTRY_T */
-
-/* wq_head->head and wq_entry->entry exist */
-/* #undef HAVE_WAIT_QUEUE_HEAD_ENTRY */
-
/* int (*writepage_t)() takes struct folio* */
/* #undef HAVE_WRITEPAGE_T_FOLIO */
-/* xattr_handler->get() wants dentry */
-/* #undef HAVE_XATTR_GET_DENTRY */
-
-/* xattr_handler->get() wants both dentry and inode */
-/* #undef HAVE_XATTR_GET_DENTRY_INODE */
-
/* xattr_handler->get() wants dentry and inode and flags */
/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */
-/* xattr_handler->get() wants xattr_handler */
-/* #undef HAVE_XATTR_GET_HANDLER */
-
-/* xattr_handler has name */
-/* #undef HAVE_XATTR_HANDLER_NAME */
-
-/* xattr_handler->list() wants dentry */
-/* #undef HAVE_XATTR_LIST_DENTRY */
-
-/* xattr_handler->list() wants xattr_handler */
-/* #undef HAVE_XATTR_LIST_HANDLER */
-
-/* xattr_handler->list() wants simple */
-/* #undef HAVE_XATTR_LIST_SIMPLE */
-
-/* xattr_handler->set() wants dentry */
-/* #undef HAVE_XATTR_SET_DENTRY */
-
/* xattr_handler->set() wants both dentry and inode */
/* #undef HAVE_XATTR_SET_DENTRY_INODE */
-/* xattr_handler->set() wants xattr_handler */
-/* #undef HAVE_XATTR_SET_HANDLER */
-
/* xattr_handler->set() takes mnt_idmap */
/* #undef HAVE_XATTR_SET_IDMAP */
@@ -1122,9 +747,6 @@
/* Define if you have [z] */
#define HAVE_ZLIB 1
-/* __posix_acl_chmod() exists */
-/* #undef HAVE___POSIX_ACL_CHMOD */
-
/* kernel exports FPU functions */
/* #undef KERNEL_EXPORTS_X86_FPU */
@@ -1149,9 +771,6 @@
/* make_request_fn() return type */
/* #undef MAKE_REQUEST_FN_RET */
-/* struct shrink_control has nid */
-/* #undef SHRINK_CONTROL_HAS_NID */
-
/* using complete_and_exit() instead */
/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */
@@ -1181,41 +800,8 @@
/* /dev/zfs minor */
/* #undef ZFS_DEVICE_MINOR */
-/* enum node_stat_item contains NR_FILE_PAGES */
-/* #undef ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES */
-
-/* enum node_stat_item contains NR_INACTIVE_ANON */
-/* #undef ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON */
-
-/* enum node_stat_item contains NR_INACTIVE_FILE */
-/* #undef ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE */
-
-/* enum zone_stat_item contains NR_FILE_PAGES */
-/* #undef ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES */
-
-/* enum zone_stat_item contains NR_INACTIVE_ANON */
-/* #undef ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON */
-
-/* enum zone_stat_item contains NR_INACTIVE_FILE */
-/* #undef ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE */
-
-/* GENHD_FL_EXT_DEVT flag is not available */
-/* #undef ZFS_GENHD_FL_EXT_DEVT */
-
-/* GENHD_FL_NO_PART_SCAN flag is available */
-/* #undef ZFS_GENHD_FL_NO_PART */
-
-/* global_node_page_state() exists */
-/* #undef ZFS_GLOBAL_NODE_PAGE_STATE */
-
-/* global_zone_page_state() exists */
-/* #undef ZFS_GLOBAL_ZONE_PAGE_STATE */
-
-/* Define to 1 if GPL-only symbols can be used */
-/* #undef ZFS_IS_GPL_COMPATIBLE */
-
/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.2.99-693-FreeBSD_gb10992582"
+#define ZFS_META_ALIAS "zfs-2.3.0-rc1-FreeBSD_g3a9fca901"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@@ -1224,10 +810,10 @@
/* #undef ZFS_META_DATA */
/* Define the maximum compatible kernel version. */
-#define ZFS_META_KVER_MAX "6.10"
+#define ZFS_META_KVER_MAX "6.11"
/* Define the minimum compatible kernel version. */
-#define ZFS_META_KVER_MIN "3.10"
+#define ZFS_META_KVER_MIN "4.18"
/* Define the project license. */
#define ZFS_META_LICENSE "CDDL"
@@ -1245,10 +831,10 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
-#define ZFS_META_RELEASE "693-FreeBSd_gb10992582"
+#define ZFS_META_RELEASE "rc1-FreeBSD_g3a9fca901"
/* Define the project version. */
-#define ZFS_META_VERSION "2.2.99"
+#define ZFS_META_VERSION "2.3.0"
/* count is located in percpu_ref.data */
/* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */
diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h
index 2113c3fc2680..3a1480d8dc66 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define ZFS_META_GITREV "zfs-2.2.99-693-gb10992582"
+#define ZFS_META_GITREV "zfs-2.3.0-rc1-0-g3a9fca901"