From nobody Sat Jun 01 15:18:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vs3XP65h4z5N2fg; Sat, 01 Jun 2024 15:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vs3XP5Mtqz4Lgb; Sat, 1 Jun 2024 15:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717255093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VBbGTPsRhxcmWvnmV+hDoQwWgo/iPuw3SGvSwVFNT+Q=; b=svqeDXqrp/5O3q7Pgl5pSvaaqmaJC71PdL9AC3I4pIGcr9WnT4ORqd1VeNw5kaj1hWQnbE lVZykFEmBdpqVXdF8X0UlwpzmLoegDk08Qwl8mGxmoSQUjB/ThoHyo1O0ySEph7UV7EYLG J4saFxLAzxp8NAjaayJRWZjvEHOY5MFbW4ive46EoLiWToOtHj4endsFk1HHtYURVKRT0F GVNZsQy7M3aBMZaQuLNy5ZgSyA2Dm5h6yGWdakbuiSUDoz6bdWYUDv6Nl31pw0RzNWiMnb sAbJ+Ig4UzRZx3Ok6ZjQiDlrbHvxvCkUhxGF21b5vMWh5vJvFlQn2/IPvZd56Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255093; a=rsa-sha256; cv=none; b=xszBObR26UgaQmauPfTHcM1xxesZsD3VCkoW/V7NZ9wGqCgVybyhBwB0t5ibzE7i5Dsxog 5mNm3AXTEU3ZKHAg90oioRIRWdAlcYKM85AqpsMkjd2cga7HDe/MMx6h1Mf9UPx+IiMEjt D137udJq5sQWMrS+X869Ff7+ja4rQs4eyD5kKj9hhmd9Rd3kCJWPSPrXNMnIKQRbJZn69S 9BiStLdf6YHwhILJj/62yTUp+UqkvtRVHSsm9Hu0kl8+WBlaS2hNEEwada9UAkykiWfphl PWulRbvP/dtC81TPFMgIxkVG2fUrcrmYlrSTFmBKyjcgdbHP5WwuuZk3Xwdtqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717255093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VBbGTPsRhxcmWvnmV+hDoQwWgo/iPuw3SGvSwVFNT+Q=; b=PMcjmk1Y3epcqqzhN5iSYT2msLGSq884M02vbNCA1dwjS082+7kXXI/fhIZd35A7yBY1P8 k/BW/rusAayCO3JWuWScEpgqb9K3EaHgUNzRRSaz+LSyH3XNPiCX/p/Wkh3nO5rexqMr41 2NhrRdqdA9ZxZ2p01SsoRMx2dD7JtZQHU2cNsqLfINAVKmaE28pOiNmoTN1HcnDfAe73jJ HugWKH/pZICtGFr2XtHic9JcWfrNs3328y/GOApaczObFWKDzvVlZxfrP9Vk9gpM5kcAfZ jDh4q+qpa3oJZTk1uYPhwd+wr/MeHfDedX+/Ryl5TIVmwUsrgoO4Ci6Le5mD0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3XP4zkTz1C3x; Sat, 1 Jun 2024 15:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 451FID41062955; Sat, 1 Jun 2024 15:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451FIDQD062953; Sat, 1 Jun 2024 15:18:13 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:13 GMT Message-Id: <202406011518.451FIDQD062953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2468e20df43f - main - boot/zfs: Sync the definition of dsl_dataset_phys with OpenZFS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2468e20df43fdc8e5042e45a42235cf00e65e4b1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2468e20df43fdc8e5042e45a42235cf00e65e4b1 commit 2468e20df43fdc8e5042e45a42235cf00e65e4b1 Author: Mark Johnston AuthorDate: 2024-05-04 16:12:21 +0000 Commit: Mark Johnston 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 {