diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-02-20 16:39:54 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2025-02-20 16:40:55 +0000 |
| commit | b59a0cde6a5253f94494397ce5b18dbfa071e08c (patch) | |
| tree | 15747c8ac150721104eefa6d7f7165b062d9a576 /sys/modules/zfs | |
| parent | 7f9ef5c75fd18fadcd2a74c2c489f218d7611208 (diff) | |
| parent | 6a2f7b38442b42f4bc9a848f8de10fc792ce8d76 (diff) | |
zfs: merge openzfs/zfs@6a2f7b384
Notable upstream pull request merges:
#16857 387ed5ca4 Add recursive dataset mounting and unmounting support
to pam_zfs_key
#16929 c2458ba92 optimize recv_fix_encryption_hierarchy()
#16980 12f0baf34 Make the vfs.zfs.vdev.raidz_impl sysctl cross-platform
#16986 40496514b Expand fragmentation table to reflect larger possibile
allocation sizes
#17003 88020b993 Add kstats tracking gang allocations
#17013 21205f648 Avoid ARC buffer transfrom operations in prefetch
#17016 390f6c119 zio: lock parent zios when updating wait counts on
reexecute
#17029 b8c73ab78 zio: do no-op injections just before handing off to vdevs
#17037 6a2f7b384 Fix metaslab group fragmentation math
#17040 b901d4a0b Update the dataset name in handle after zfs_rename
Obtained from: OpenZFS
OpenZFS commit: 6a2f7b38442b42f4bc9a848f8de10fc792ce8d76
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 b6cb1ab0652e..fcf5949c8ca6 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -254,6 +254,9 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + /* Define to 1 if you have the 'execvpe' function. */ #define HAVE_EXECVPE 1 @@ -401,6 +404,9 @@ /* iops->symlink() takes struct user_namespace* */ /* #undef HAVE_IOPS_SYMLINK_USERNS */ +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + /* iov_iter_type() is available */ /* #undef HAVE_IOV_ITER_TYPE */ @@ -787,7 +793,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.3.99-170-FreeBSD_g34205715e" +#define ZFS_META_ALIAS "zfs-2.3.99-189-FreeBSD_g6a2f7b384" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -817,7 +823,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "170-FreeBSD_g34205715e" +#define ZFS_META_RELEASE "189-FreeBSD_g6a2f7b384" /* Define the project version. */ #define ZFS_META_VERSION "2.3.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 0a2a21e6ddf1..d6c39ea2840a 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.3.99-170-g34205715e" +#define ZFS_META_GITREV "zfs-2.3.99-189-g6a2f7b384" |