zfs: merge openzfs/zfs@fae4c664a

Notable upstream pull request merges: #16942 fae4c66 FreeBSD: Use ashift in vdev_check_boot_reserve() Obtained from: OpenZFS OpenZFS commit: fae4c66
freebsd · Jan 11, 2025 · 9d6043f · 9d6043f
2 parents 6bfe9a1 + fae4c66
commit 9d6043f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c
@@ -96,7 +96,7 @@ vdev_check_boot_reserve(spa_t *spa, vdev_t *childvd)
 {
 	ASSERT(childvd->vdev_ops->vdev_op_leaf);
 
-	size_t size = SPA_MINBLOCKSIZE;
+	size_t size = 1ULL << childvd->vdev_top->vdev_ashift;
 	abd_t *abd = abd_alloc_linear(size, B_FALSE);
 
 	zio_t *pio = zio_root(spa, NULL, NULL, 0);

diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
@@ -787,7 +787,7 @@
 /* #undef ZFS_DEVICE_MINOR */
 
 /* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.3.99-157-FreeBSD_gb8e09c700"
+#define ZFS_META_ALIAS "zfs-2.3.99-158-FreeBSD_gfae4c664a"
 
 /* Define the project author. */
 #define ZFS_META_AUTHOR "OpenZFS"
@@ -817,7 +817,7 @@
 #define ZFS_META_NAME "zfs"
 
 /* Define the project release. */
-#define ZFS_META_RELEASE "157-FreeBSD_gb8e09c700"
+#define ZFS_META_RELEASE "158-FreeBSD_gfae4c664a"
 
 /* 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
@@ -1 +1 @@
-#define	ZFS_META_GITREV "zfs-2.3.99-157-gb8e09c700"
+#define	ZFS_META_GITREV "zfs-2.3.99-158-gfae4c664a"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define ZFS_META_GITREV "zfs-2.3.99-157-gb8e09c700"
		#define ZFS_META_GITREV "zfs-2.3.99-158-gfae4c664a"