From nobody Wed Oct 25 16:56:43 2023 X-Original-To: dev-commits-src-branches@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 4SFw7c03ddz4xlCB; Wed, 25 Oct 2023 16:56:44 +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 4SFw7b6j3Mz4bbr; Wed, 25 Oct 2023 16:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698253003; 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=lmGRK9Gd8/RooIzvPEQHJBOzYZ1wb8EWkuDtgnkeMx8=; b=XghptgicFWU9wfuJMsutcmpMnulDM8JBAYc+dexn9p6iEFwUgme1IOe7knR8wHzFgA520G ayaSadeZwAtOeJlXqCgCGqfHqBqN++oeBkHdTNk3o3/ZcCGUBwSXe1/T6fIYY4sDjNslmx 3N+jgokY2+58bYlXj9Ys/1yq8XrFg0toUIW9quZtLgBmS/yY4+JouZ6FgzQuNOA2sMNitv juZ+PQWQ1I4y9bAncMVo7NwkB0JOU3EZbLIk/oXEvsd/DVtNs+qp6y0iPlKkhSowD4yUmA MW/7u/8MkMj1LCR8qO5743hnQHT2lFxsqgTo61iJovjEj/fGebXfuT/MTDzyCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698253003; a=rsa-sha256; cv=none; b=swuW6a/rMVD8AtGUFUuTizg7DbkARNSuVEPSn+zvugKMWRmKb7a3/8woDXBcj3sRul8Bn1 483VakeSTYj9uNgfbL6Qg2AHZSsDJeJiTo56aXNOhhEMZG1uovp96jdv1e4QeJyiZbzyvY GUXIa9+9uYNOxHvuoN6U2EH0L4H+SWmMSgprTwCar+87iRp1pS5DVKgNg1TBKfl++a7ib9 wLZy5ynIpjRWEkXJcviGBTQdz/HLm26+H/2LEAvgtlfucM3RoHuW83DiBzgJ4N62tLA/9d tQG3aLZvHaLySoomgMH1045aNGf+Hb9XD4gpaWLYNST5U1urAT45leVQjxDHrQ== 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=1698253003; 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=lmGRK9Gd8/RooIzvPEQHJBOzYZ1wb8EWkuDtgnkeMx8=; b=BMDdqCulhh5oWNjLfvacztRN/HNEHQPahamZN43UhwTmONAoAMev/nIZChaSeEQGmI+ENX v0eac4pLrmbjlq2tJx4yqGtCViRUpv+uZCxHURenHp2jEA3Chfghy8MWzuZVeokTypLZ9r /I/NvPNObTTpdMNl4a0ciNjc91v9Wd5lwc46EUZe81zo6DFoeVbTfyZzeYIBdTPmi5+MH0 F4ODr2JIw8ozCuYcXDVVk6TXjCW5PiI4eyTcQnh0lt9ADzc8Qp23DVpWVnD7qrkAehZPfR +AQ+rjPGlDZIC1jNVsE7hYCuwHmB2INCnFjSmY+bUtvjBZgDOGY6GT+OonIKug== 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 4SFw7b5lPNz1Bv3; Wed, 25 Oct 2023 16:56:43 +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 39PGuhvV022013; Wed, 25 Oct 2023 16:56:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PGuhLw022010; Wed, 25 Oct 2023 16:56:43 GMT (envelope-from git) Date: Wed, 25 Oct 2023 16:56:43 GMT Message-Id: <202310251656.39PGuhLw022010@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: 333d3a18434b - releng/14.0 - boot/zfs: Add some fields to dsl_dir_phys_t List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 333d3a18434bac1be2d3d527b091c95e04124603 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=333d3a18434bac1be2d3d527b091c95e04124603 commit 333d3a18434bac1be2d3d527b091c95e04124603 Author: Mark Johnston AuthorDate: 2023-10-23 15:05:50 +0000 Commit: Mark Johnston CommitDate: 2023-10-25 16:55:46 +0000 boot/zfs: Add some fields to dsl_dir_phys_t Most of the first block of pad bytes are now used for space accounting purposes. No functional change intended. Approved by: re (gjb) MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 731b737107e329cef32efb79847633b03a73cc30) --- sys/cddl/boot/zfs/zfsimpl.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index 843565607a49..fcaf407bcb75 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -1406,6 +1406,17 @@ typedef enum { #define SM2_RUN_MAX SM2_RUN_DECODE(~0ULL) #define SM2_OFFSET_MAX SM2_OFFSET_DECODE(~0ULL) +typedef enum dd_used { + DD_USED_HEAD, + DD_USED_SNAP, + DD_USED_CHILD, + DD_USED_CHILD_RSRV, + DD_USED_REFRSRV, + DD_USED_NUM +} dd_used_t; + +#define DD_FLAG_USED_BREAKDOWN (1 << 0) + typedef struct dsl_dir_phys { uint64_t dd_creation_time; /* not actually used */ uint64_t dd_head_dataset_obj; @@ -1424,7 +1435,9 @@ typedef struct dsl_dir_phys { /* Administrative reservation setting */ uint64_t dd_reserved; uint64_t dd_props_zapobj; - uint64_t dd_pad[7]; + uint64_t dd_pad[1]; + uint64_t dd_flags; + uint64_t dd_used_breakdown[DD_USED_NUM]; uint64_t dd_clones; uint64_t dd_pad1[13]; /* pad out to 256 bytes for good measure */ } dsl_dir_phys_t;