diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-05-31 07:31:58 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-05-31 09:26:50 +0000 |
| commit | aca928a50a42f00f344df934005b09dbcb4e2f77 (patch) | |
| tree | 810e8ee1828737bb6edb37ef594118fccbf58b45 /sys/modules/zfs | |
| parent | d28bbfa2715a45c841e0eeec38d7f7b73513c66e (diff) | |
| parent | e2357561b9499296bff758afe4868dbc39735675 (diff) | |
zfs: merge openzfs/zfs@e2357561b
Notable upstream pull request merges:
#15940 41ae864b6 Replace P2ALIGN with P2ALIGN_TYPED and delete P2ALIGN
#16128 5137c132a zpool import output is not formated properly
#16138 efbef9e6c FreeBSD: Add zfs_link_create() error handling
#16146 04bae5ec9 Disable high priority ZIO threads on FreeBSD and Linux
#16151 cc3869153 zfs_ioc_send: use a dedicated taskq thread for send
#16151 adda768e3 spa: remove spa_taskq_dispatch_sync()
#16151 515c4dd21 spa: flatten spa_taskq_dispatch_ent()
#16151 0a543db37 spa_taskq_dispatch_ent: simplify arguments
#16153 975a13259 Add support for parallel pool exports
#16153 89acef992 Simplified the scope of the namespace lock
#16159 136c05321 ZAP: Fix leaf references on zap_expand_leaf() errors
#16162 af5dbed31 Fix scn_queue races on very old pools
#16165 3400127a7 Fix ZIL clone records for legacy holes
#16167 414acbd37 Unbreak FreeBSD cross-build on MacOS broken in 051460b8b
#16172 eced2e2f1 libzfs: Fix mounting datasets under thread limit pressure
#16178 b64afa41d Better control the thread pool size when mounting datasets
#16181 fa99d9cd9 zfs_dbgmsg_print: make FreeBSD and Linux consistent
#16191 e675852bc dbuf: separate refcount calls for dbuf and dbuf_user
#16198 a043b60f1 Correct level handling in zstream recompress
#16204 34906f8bb zap: reuse zap_leaf_t on dbuf reuse after shrink
#16206 d0aa9dbcc Use memset to zero stack allocations containing unions
#16207 8865dfbca Fix assertion in Persistent L2ARC
#16208 08648cf0d Allow block cloning to be interrupted by a signal
#16210 e2357561b FreeBSD: Add const qualifier to members of struct
opensolaris_utsname
#16214 800d59d57 Some improvements to metaslabs eviction
#16216 02c5aa9b0 Destroy ARC buffer in case of fill error
#16225 01c8efdd5 Simplify issig()
Obtained from: OpenZFS
OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 10 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 4d6786e92d22..d5e9cebfffc7 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -87,6 +87,9 @@ #define HAVE_AVX512VL 1 #endif +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + /* bdevname() is available */ /* #undef HAVE_BDEVNAME */ @@ -598,6 +601,9 @@ /* Define if compiler supports -Winfinite-recursion */ /* #undef HAVE_KERNEL_INFINITE_RECURSION */ +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + /* kernel has kernel_neon_* functions */ /* #undef HAVE_KERNEL_NEON */ @@ -1188,7 +1194,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-474-FreeBSD_g8f1b7a6fa" +#define ZFS_META_ALIAS "zfs-2.2.99-517-FreeBSD_ge2357561b" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1218,7 +1224,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "474-FreeBSD_g8f1b7a6fa" +#define ZFS_META_RELEASE "517-FreeBSD_ge2357561b" /* 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 7bdd4299c8fa..bb0820a7f0b8 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-474-g8f1b7a6fa" +#define ZFS_META_GITREV "zfs-2.2.99-517-ge2357561b" |