diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-01-11 09:42:32 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2025-01-11 09:45:30 +0000 |
| commit | 9d6043f980a2ee424976c71c437888c9095f8142 (patch) | |
| tree | e45592a892d1ce15029556b64c295234d1fa5ac2 | |
| parent | 6bfe9a1393ddcc4c41c8bf0ef8a5c4ef43eaebd4 (diff) | |
| parent | fae4c664a4a67f51d13520ab432d96315d880af8 (diff) | |
zfs: merge openzfs/zfs@fae4c664a
Notable upstream pull request merges:
#16942 fae4c664a FreeBSD: Use ashift in vdev_check_boot_reserve()
Obtained from: OpenZFS
OpenZFS commit: fae4c664a4a67f51d13520ab432d96315d880af8
| -rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
3 files changed, 4 insertions, 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 index 79732d9173e8..f1843807fd5d 100644 --- 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 index 3f8def5ce6f8..afd68fc026d4 100644 --- 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 index 7cfe3689e608..990e0f51e04f 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-157-gb8e09c700" +#define ZFS_META_GITREV "zfs-2.3.99-158-gfae4c664a" |