Date: Thu, 21 Sep 2023 11:13:00 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 646c82e08a43 - stable/14 - zfs: update zfs_config.h and zfs_gitrev.h (missed in 35e5fd1b2) Message-ID: <202309211113.38LBD0Le074669@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=646c82e08a433b61b97073051fd558e42c64603c commit 646c82e08a433b61b97073051fd558e42c64603c Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2023-09-21 11:10:13 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2023-09-21 11:12:46 +0000 zfs: update zfs_config.h and zfs_gitrev.h (missed in 35e5fd1b2) --- sys/modules/zfs/zfs_config.h | 27 ++++++++++++++++++++++++--- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 122a7a3f032e..f5d0a4d6d7d1 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -147,6 +147,9 @@ /* 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 */ @@ -156,6 +159,9 @@ /* blkdev_issue_secure_erase() is available */ /* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + /* blkdev_reread_part() exists */ /* #undef HAVE_BLKDEV_REREAD_PART */ @@ -177,6 +183,9 @@ /* 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 */ @@ -216,6 +225,9 @@ /* 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 */ @@ -243,6 +255,9 @@ /* 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 */ @@ -502,6 +517,9 @@ /* 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 */ @@ -664,6 +682,9 @@ /* register_shrinker is vararg */ /* #undef HAVE_REGISTER_SHRINKER_VARARG */ +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + /* iops->rename2() exists */ /* #undef HAVE_RENAME2 */ @@ -1074,7 +1095,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_ge96fbdba3" +#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g62677576a" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1083,7 +1104,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.4" +#define ZFS_META_KVER_MAX "6.5" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "3.10" @@ -1104,7 +1125,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_ge96fbdba3" +#define ZFS_META_RELEASE "FreeBSD_g62677576a" /* Define the project version. */ #define ZFS_META_VERSION "2.2.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index f29b7621500d..9b7204050397 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.0-rc4-1-ge96fbdba3" +#define ZFS_META_GITREV "zfs-2.2.0-rc4-20-g62677576a"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309211113.38LBD0Le074669>