From nobody Sun Jun 09 14:12:15 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 4Vxxhg48DPz5MCSq; Sun, 09 Jun 2024 14:12:19 +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 4Vxxhg0JZKz4DPW; Sun, 9 Jun 2024 14:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942339; 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=7Kaqrg6A95tWj50j2nMbnTdf9KQ8hphZSPbeQKeMQY8=; b=BWVyphLceif+rac2SFB6zj/gKOgbGwwtQjUyrFK2NdshuH2TrX9KkvxwuRAicg3O/+RZuR Yc/sVy+g5XY7TpyA92hBGxlFgATOyiCV9kadkYaDhybCQDPp0bCkJGhQIAyZzcRj47/kDu pHenqbzoKKUH2pugAJ3n51m5plfr/mijZY3HnJ3tBoYU0F1t1kqpMpm0zmzB3Wsbfw0Dsq 8fT915017v0QHP/KLkz2nhiR6lca7o9m9qEpwgW+LZFDTZXlU6tVT3YGHveYXd2JTlXcJM 1lO5YX6IqdLozOjE1Mbfe80aBYdCFxOzKyNuUVak/h0UlV7v9XF6XioZ+Erj2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942339; a=rsa-sha256; cv=none; b=pXhXXkqsbGqsMuIg5ENejbEyvv5MZ9cQkZJ5kggBbBd6T1NQeEyKoJ2jO34Smcn4ehCh0+ OnBRleY1M0zT0ds6XTRqESIw45rbHfjd8v6bbxLgVR+KRH7sKCWe5CgEIQEaxlVol3BINc 7xTEb08xOyTD4EktwtomAoG7X8l/2vpu6mCEiruZis8QfcHrA99694zg0FDthOFOdPdpmV px2idnNFuYxDpL5EPHlI2mCYohSntYE9cA/clr4amJV5nD2QH/tQTl87fugx7bb4TSc/Y5 k3MqGjhOYiB7X96o7+a+MGy1WQBkYzlwG2JF/cElXU/OQ8VYXzDgUUNLBmqeFA== 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=1717942339; 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=7Kaqrg6A95tWj50j2nMbnTdf9KQ8hphZSPbeQKeMQY8=; b=ji0eDHOcHzJaRQ81MYEzQiBI0Wmqcu/1wUU5lQAls1NKPKWSMbQDGVmYEdgK5TC75lDp6r R+WxULS3vE+tfAx8RauvMDB6dgqFxDM46zR7BFkK6QJYuUQrb96kWE5P/PlRrkTztMHi3o ODnwpdQbvukX7So5NpuMBI5OlQpTSh+1yyfBQHtCP+sWyeKmz2fVrj6lEJkfM42Gt8MyyI IqFpT2KYo40ZbHE1VqpPkFBE0x8FzWOxG8jbUm9O+JzycnGvel33bSrz1CyiabFZ+8ZqBb pc/nDf/lJdFSHxF1v/0FSFYNMeeE/OFasKhM8Kg0Z6EWDQypIY4Vedge75gObg== 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 4Vxxhc0SXmzm34; Sun, 9 Jun 2024 14:12:16 +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 459ECFBs085989; Sun, 9 Jun 2024 14:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459ECFgJ085986; Sun, 9 Jun 2024 14:12:15 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:15 GMT Message-Id: <202406091412.459ECFgJ085986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0db67d7b5de8 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0db67d7b5de8338f95fa55e6d5c7a23c7bfa1e7a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0db67d7b5de8338f95fa55e6d5c7a23c7bfa1e7a commit 0db67d7b5de8338f95fa55e6d5c7a23c7bfa1e7a Author: Mark Johnston AuthorDate: 2024-05-04 16:12:21 +0000 Commit: Mark Johnston 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 {