From nobody Wed Oct 25 15:03:15 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 4SFsch0t0zz4xcj0; Wed, 25 Oct 2023 15:03:16 +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 4SFscg71G3z4RV7; Wed, 25 Oct 2023 15:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698246196; 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=MAe6SiMNz/csU1YUHrvNkUV/ekLDgLQ7kdWehhFfZ0U=; b=JwUGbNvmTasSBKg3egDB/ZFvTqwNoB2xkdP09yH4pzlrunh6y7Up8U0WwzmBikdJdwXPuO nJlDH4bhDi+8mN/zB0ZwAErEAXhAnH2xoQQxZThrPAlK5xHqdp9kxs6aDi3P9A3z6Q1hF/ 5rFz3kldIUW1841hDXFm5o+J8VluitzjtsXrwgpBZGgxT0J2m1cxOw9kycoEM9wShA72w0 Y0XJ07AYEoJf7/+6/ihvuL3UTxTXxYdVIIsQ1DHYrn44hjaCmQwv2Jap7IA912R7O9jCni KExdrpvYGRJdBn/O98yM3mZuKdEFx64uIB7xKWrPqh1xsz7g8WlafjlucwuKxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698246196; a=rsa-sha256; cv=none; b=XfGCEtTQHh+0U5g5+7sLohzcmk+xnsT5O0WQtahrWDAcqpMzvrSWXkhCC1Hct/o4ckOB6+ 0BmLWtVjTz0DfRkXvL8GGS1mjLMMA4IXdDUUff9zQJe11t0o1Y6MGnojVXWbrgIysyrHBW LVzn/Un/GxC2Zw2NKezs1ESBHltMj824Lj8xR6Kcskj0ku6Bba+hMU42Mj52lvlzBel01C tg7cknO9VFuzbx/tH/Fb40X2ap6wW5opVMN96RC0GrFrynfXTvwFct/v5fvEhoZA/pvule bPPZdTxBU3aQkDDa5xpOvaR/WOFXymi7ConohLnJbAY2QAIGXLq7uAmrkzYyeQ== 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=1698246196; 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=MAe6SiMNz/csU1YUHrvNkUV/ekLDgLQ7kdWehhFfZ0U=; b=uXV+/nWfkM1xZPVGJrXFucjiBpAZZgXfdcCCua/0Ig+/e7W2p+C9ItdEgr0FqCCdYOmQqq WNQErIb+dY0mMk/cahcbbN++aPt4nZRmR/Q9bXNlX9P5biL+gL4k/Q5CVzVaUatyWi+dV4 cLSm2RO+pT6yABPSKnZZxRikWKiczzp/Ml4DfwuX2Uve8FayAeGn1GdmcO0fkX482o8dW+ DPLCIHhvikS9+spzbkmnp616i5h3fB5qsBibyPI4nwowSZt15ZC2o/ODJ0qIbppKThqHzP dPngn6p4Igk2Va5XNiBqtQ5+e8ShBMWYJNApeHX22d4in6LT+wgsBTfSaOnWdA== 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 4SFscg621tz18Hq; Wed, 25 Oct 2023 15:03:15 +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 39PF3FJj038958; Wed, 25 Oct 2023 15:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PF3FYq038955; Wed, 25 Oct 2023 15:03:15 GMT (envelope-from git) Date: Wed, 25 Oct 2023 15:03:15 GMT Message-Id: <202310251503.39PF3FYq038955@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: 731b737107e3 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 731b737107e329cef32efb79847633b03a73cc30 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=731b737107e329cef32efb79847633b03a73cc30 commit 731b737107e329cef32efb79847633b03a73cc30 Author: Mark Johnston AuthorDate: 2023-10-23 15:05:50 +0000 Commit: Mark Johnston CommitDate: 2023-10-25 14:27:26 +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. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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;