Date: Sun, 9 Jun 2024 14:12:15 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0db67d7b5de8 - stable/14 - boot/zfs: Sync the definition of dsl_dataset_phys with OpenZFS Message-ID: <202406091412.459ECFgJ085986@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0db67d7b5de8338f95fa55e6d5c7a23c7bfa1e7a commit 0db67d7b5de8338f95fa55e6d5c7a23c7bfa1e7a Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-05-04 16:12:21 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2024-06-09 13:47:48 +0000 boot/zfs: Sync the definition of dsl_dataset_phys with OpenZFS No functional change intended. MFC after: 1 week (cherry picked from commit 2468e20df43fdc8e5042e45a42235cf00e65e4b1) --- 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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406091412.459ECFgJ085986>