diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-03-09 09:24:49 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2025-03-09 11:52:57 +0000 |
| commit | d2a8fad3579763bd288260c8c465ab9eb448d465 (patch) | |
| tree | 379aed3a1a73291e90d85de5debf8fe00ec1ff11 /sys/modules/zfs | |
| parent | 1016b3c344350fa5968f16852e5e4e388c51d817 (diff) | |
| parent | fe674998bb2d0912660d8aa3f2904b70f57497b0 (diff) | |
zfs: merge openzfs/zfs@fe674998b
Notable upstream pull request merges:
#17042 ece35e0e6 zpool: allow relative vdev paths
#17046 c43df8bbb vdev_file: unify FreeBSD and Linux implementations
#17064 ee8803adc vdev_file: make FLUSH and TRIM asynchronous
#17066 ecc44c45c include: move zio_priority_t into zfs.h
#17071 ab3db6d15 arc: avoid possible deadlock in arc_read
#17079 682c5f6a0 Fix wrong free function in arc_hdr_decrypt
#17080 701093c44 Don't try to get mg of hole vdev in removal
#17081 d7d274471 Better fill empty metaslabs
#17088 a5fb5c55b spa: fix signature mismatch for spa_boot_init as
eventhandler required
#17089 7f05fface gcm_avx_init: zero the ghash state after hashing the IV
#17122 fe674998b Check portable objset MAC even if local is zeroed
Obtained from: OpenZFS
OpenZFS commit: fe674998bb2d0912660d8aa3f2904b70f57497b0
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 5 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 253d6234d78b..056530bc4645 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -185,7 +185,6 @@ SRCS+= abd_os.c \ kmod_core.c \ spa_os.c \ sysctl_os.c \ - vdev_file.c \ vdev_geom.c \ vdev_label_os.c \ zfs_acl.c \ @@ -298,6 +297,7 @@ SRCS+= abd.c \ vdev.c \ vdev_draid.c \ vdev_draid_rand.c \ + vdev_file.c \ vdev_indirect.c \ vdev_indirect_births.c \ vdev_indirect_mapping.c \ diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index fcf5949c8ca6..1a1170ffdf44 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -218,6 +218,7 @@ the CoreFoundation framework. */ /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ +/* check_disk_change() exists */ /* #undef HAVE_CHECK_DISK_CHANGE */ /* copy_splice_read exists */ @@ -793,7 +794,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.3.99-189-FreeBSD_g6a2f7b384" +#define ZFS_META_ALIAS "zfs-2.3.99-212-FreeBSD_gfe674998b" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -823,7 +824,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "189-FreeBSD_g6a2f7b384" +#define ZFS_META_RELEASE "212-FreeBSD_gfe674998b" /* 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 d6c39ea2840a..e27544c9894d 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-189-g6a2f7b384" +#define ZFS_META_GITREV "zfs-2.3.99-212-gfe674998b" |