git: ed0083d08115 - releng/15.0 - zfs: update zfs_config.h and zfs_gitrev.h after ce7e1f86a (zfs-2.4.0-rc3)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 28 Oct 2025 21:23:37 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=ed0083d08115f4cb64c05d6b74b286e45b75b733
commit ed0083d08115f4cb64c05d6b74b286e45b75b733
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-10-25 09:16:36 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-28 21:22:53 +0000
zfs: update zfs_config.h and zfs_gitrev.h after ce7e1f86a (zfs-2.4.0-rc3)
Approved by: re (cperciva)
(cherry picked from commit 51d5e8c8ca0f3c8bdd26b042973b3dbe8f30d607)
---
sys/modules/zfs/zfs_config.h | 17 +++++++++++++++--
sys/modules/zfs/zfs_gitrev.h | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 35d79f08ede1..339182042915 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -204,6 +204,10 @@
/* BLK_STS_RESV_CONFLICT is defined */
/* #undef HAVE_BLK_STS_RESV_CONFLICT */
+/* Define if getgeo() in block_device_operations takes struct gendisk * as its
+ first arg */
+/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */
+
/* Define if release() in block_device_operations takes 1 arg */
/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */
@@ -339,6 +343,9 @@
/* Define if compiler supports -Winfinite-recursion */
/* #undef HAVE_INFINITE_RECURSION */
+/* inode_generic_drop() exists */
+/* #undef HAVE_INODE_GENERIC_DROP */
+
/* inode_get_atime() exists in linux/fs.h */
/* #undef HAVE_INODE_GET_ATIME */
@@ -510,6 +517,9 @@
/* Define if host toolchain supports MOVBE */
#define HAVE_MOVBE 1
+/* Define if ns_type is accessible through ns_common */
+/* #undef HAVE_NS_COMMON_TYPE */
+
/* folio_wait_bit() exists */
/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */
@@ -759,6 +769,9 @@
/* int (*writepage_t)() takes struct folio* */
/* #undef HAVE_WRITEPAGE_T_FOLIO */
+/* write_cache_pages() is available */
+/* #undef HAVE_WRITE_CACHE_PAGES */
+
/* xattr_handler->get() wants dentry and inode and flags */
/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */
@@ -843,7 +856,7 @@
/* #undef ZFS_DEVICE_MINOR */
/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.4.0-rc2-FreeBSD_g2f50d6740"
+#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@@ -873,7 +886,7 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
-#define ZFS_META_RELEASE "rc2-FreeBSD_g2f50d6740"
+#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba"
/* Define the project version. */
#define ZFS_META_VERSION "2.4.0"
diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h
index b3bd4d7651b3..ba87aecc9751 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define ZFS_META_GITREV "zfs-2.4.0-rc2-0-g2f50d6740"
+#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba"