aboutsummaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2024-03-01 13:57:40 +0000
committerMartin Matuska <mm@FreeBSD.org>2024-03-01 14:16:06 +0000
commitb9c2c366db1beb2ed276947056f45938ad8f57ec (patch)
treeafd52ba893942a3023b39bd092a3ffb0ade5ea7a /sys/modules
parentb9880e247b26c84a5800b7cba514a65843d55e2e (diff)
parentfb6d532066f23458f768a97ae94b158c42cbe484 (diff)
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/zfs/zfs_config.h63
-rw-r--r--sys/modules/zfs/zfs_gitrev.h2
2 files changed, 61 insertions, 4 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index ac4d2c79268f..ce274e79c49d 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -105,6 +105,12 @@
/* 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 */
@@ -337,6 +343,12 @@
/* 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 */
@@ -346,6 +358,9 @@
/* 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 */
@@ -403,6 +418,15 @@
/* 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 */
@@ -415,12 +439,21 @@
/* 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 */
@@ -514,6 +547,12 @@
/* uncached_acl_sentinel() exists */
/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */
+/* Define if compiler supports -Winfinite-recursion */
+/* #undef HAVE_KERNEL_INFINITE_RECURSION */
+
+/* kernel has kernel_neon_* functions */
+/* #undef HAVE_KERNEL_NEON */
+
/* kernel does stack verification */
/* #undef HAVE_KERNEL_OBJTOOL */
@@ -523,6 +562,12 @@
/* 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 */
@@ -727,6 +772,9 @@
/* 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 */
@@ -792,12 +840,21 @@
/* submit_bio is member of struct block_device_operations */
/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */
+/* have super_block s_shrink */
+/* #undef HAVE_SUPER_BLOCK_S_SHRINK */
+
+/* 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 */
+
/* struct kobj_type has default_groups */
/* #undef HAVE_SYSFS_DEFAULT_GROUPS */
@@ -1042,7 +1099,7 @@
/* #undef ZFS_IS_GPL_COMPATIBLE */
/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.1.14-FreeBSD_gd99134be8"
+#define ZFS_META_ALIAS "zfs-2.1.15-FreeBSD_gfb6d53206"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@@ -1051,7 +1108,7 @@
/* #undef ZFS_META_DATA */
/* Define the maximum compatible kernel version. */
-#define ZFS_META_KVER_MAX "6.5"
+#define ZFS_META_KVER_MAX "6.7"
/* Define the minimum compatible kernel version. */
#define ZFS_META_KVER_MIN "3.10"
@@ -1075,7 +1132,7 @@
#define ZFS_META_RELEASE "FreeBSD_gd99134be8"
/* Define the project version. */
-#define ZFS_META_VERSION "2.1.14"
+#define ZFS_META_VERSION "2.1.15"
/* 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 7aff8347044a..669cdd6e8957 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define ZFS_META_GITREV "zfs-2.1.14-0-gd99134be8"
+#define ZFS_META_GITREV "zfs-2.1.15-0-gfb6d53206"