The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2468e20df43fdc8e5042e45a42235cf00e65e4b1
commit 2468e20df43fdc8e5042e45a42235cf00e65e4b1
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-05-04 16:12:21 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-06-01 15:12:12 +0000
boot/zfs: Sync the definition of dsl_dataset_phys with OpenZFS
No functional change intended.
MFC after: 1 week
---
sys/cddl/boot/zfs/zfsimpl.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h
index fcaf407bcb75..0ce38384abbf 100644
--- a/sys/cddl/boot/zfs/zfsimpl.h
+++ b/sys/cddl/boot/zfs/zfsimpl.h
@@ -1465,7 +1465,10 @@ typedef struct dsl_dataset_phys {
uint64_t ds_guid;
uint64_t ds_flags;
blkptr_t ds_bp;
- uint64_t ds_pad[8]; /* pad out to 320 bytes for good measure */
+ uint64_t ds_next_clones_obj; /* DMU_OT_DSL_CLONES */
+ uint64_t ds_props_obj; /* DMU_OT_DSL_PROPS for snaps */
+ uint64_t ds_userrefs_obj; /* DMU_OT_USERREFS */
+ uint64_t ds_pad[5]; /* pad out to 320 bytes for good measure */
} dsl_dataset_phys_t;
typedef struct dsl_deadlist_phys {
