diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-05-03 15:56:40 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-05-03 16:05:08 +0000 |
| commit | b985c9cafd2aedac5cf92428c0211485ea4ede24 (patch) | |
| tree | aec972d5109510ea95cd2074bfcc93a1edb50573 /sys/modules/zfs | |
| parent | 04ea5e9f84e2a62e874f7964fc94d10f454c7846 (diff) | |
| parent | 8f1b7a6fa6762ea4c89198ceb11c521f80b92ddc (diff) | |
zfs: merge openzfs/zfs@8f1b7a6fa
Notable upstream pull request merges:
#15839 c3f2f1aa2 vdev probe to slow disk can stall mmp write checker
#15888 5044c4e3f Fast Dedup: ZAP Shrinking
#15996 db499e68f Overflowing refreservation is bad
#16118 67d13998b Make more taskq parameters writable
#16128 21bc066ec Fix updating the zvol_htable when renaming a zvol
#16130 645b83307 Improve write issue taskqs utilization
#16131 8fd3a5d02 Slightly improve dnode hash
#16134 a6edc0adb zio: try to execute TYPE_NULL ZIOs on the current task
#16141 b28461b7c Fix arcstats for FreeBSD after zfetch support
Obtained from: OpenZFS
OpenZFS commit: 8f1b7a6fa6762ea4c89198ceb11c521f80b92ddc
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 13 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 6e1f5de7cf9e..4d6786e92d22 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -418,6 +418,9 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ /* #undef HAVE_GETTEXT */ +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + /* iops->get_acl() exists */ /* #undef HAVE_GET_ACL */ @@ -655,6 +658,12 @@ /* Define if you have [udev] */ /* #undef HAVE_LIBUDEV */ +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + /* Define if you have [uuid] */ /* #undef HAVE_LIBUUID */ @@ -1179,7 +1188,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-456-FreeBSD_g1f940de07" +#define ZFS_META_ALIAS "zfs-2.2.99-474-FreeBSD_g8f1b7a6fa" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1209,7 +1218,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "456-FreeBSD_g1f940de07" +#define ZFS_META_RELEASE "474-FreeBSD_g8f1b7a6fa" /* Define the project version. */ #define ZFS_META_VERSION "2.2.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index e0d3575a6230..7bdd4299c8fa 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-456-g1f940de07" +#define ZFS_META_GITREV "zfs-2.2.99-474-g8f1b7a6fa" |