From nobody Mon Oct 23 15:17:58 2023 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 4SDf2Z2tBgz4yB27; Mon, 23 Oct 2023 15:17:58 +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 4SDf2Z2Lvcz4LWQ; Mon, 23 Oct 2023 15:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074278; 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=+4AOPH3rGhSK2/8zGSz4wsZ6zf337A7nmpKd1bMRXXg=; b=aJcBbiP0URw4aHZtgrsFmuYRlj+eIZOFhvSvYN0k0ZmvCtak6PVvdfvUaB/Tu8B67H0Qw6 ia5L9ZQXTZdQLjNrFNC7aHL0NIJ2TYnjDA6HNft1eXBq+QAWIQFuohyyhvTc1F3BIGLUJ1 FZYSkM+7RXiliE93RYqy5rS+A0C8V9RFggBxGuSk/+o8XLKoTZ2+ivKquBhjEsD8BGjsHY 7h0isnFbfBOxVvX73frQwnaJnq0NbwTkV49Eh4DltQU8Aj9Sujz9lxpA9GiuDZfhc/BpbN +MGqVaRRo6XUevQ6h8BJOxVFEcUe/oYrv2WwZa5YxudLIdV/qKrEex4hqeFuag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698074278; a=rsa-sha256; cv=none; b=ggm0wo8v4pu7Os0cwCYngLRELaTNs1u2qjo1rKDXoOSzfGiqUTTTfsOiFs5ZJeGzdojYoK NcJLoHIhZP8xsVDXKcuHQRKWRbLb7UZ7UboDluY5NOwdxzxy0EDjrdCqRSSI3wMnK/lqh5 yL1s8qd1jnoGPs5FAFyhsaiJHZSc0zPLTNc3q3YQ2J7BXwSDsqzW58IGtWgcxSquXElKev N9fUH/J/d/Nf3EGfOzszvLhgdD6MaeVPQ5KSf6rI10/v6zYGRSOOcEcdHwObUX0kaA6wNY rZ8Wocc/M+RtPWkysqpngBlzWqQOCNE+WVvE7npie2dN1jyyVVdH5DViZQVAcA== 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=1698074278; 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=+4AOPH3rGhSK2/8zGSz4wsZ6zf337A7nmpKd1bMRXXg=; b=Rok6AitZy22AXnB1G4PWmx0fHhfo2m1K4cJ1zrYyxNularZ53aJvN2y4DJV+BH5CU5afGz wZScD/2MrL3zWuN2GDI7gtyH9/TCegZu5Y/yIQ0bkPmz0OQVuMY01g1SYQHtKFW7V+IzKc ++dbPzcYXuLjcUtmQUZqvRM0W3TAbOdyKWj2YEbFNswlJpUiTKlzqwcW6TXpo7xoW08Uoz 2+u3tU96+PaSQ5SMF4gYggY6GR64uTCotNej/CnLl3WieAnNRFpi2jVdufSFvzTXcwEq5W bavqNrTQJFPBzBZ5UmFjntLdF883wzdLWm+GVtp2eAfvvlWgu215CvpVD1I7PQ== 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 4SDf2Z1QSVzkvD; Mon, 23 Oct 2023 15:17:58 +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 39NFHw2m046015; Mon, 23 Oct 2023 15:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFHwGp046012; Mon, 23 Oct 2023 15:17:58 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:17:58 GMT Message-Id: <202310231517.39NFHwGp046012@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: 3115538908e9 - main - boot/zfs: Add some fields to dsl_dir_phys_t 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3115538908e9344f4c881d5f6d5182e16bcd4e7b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3115538908e9344f4c881d5f6d5182e16bcd4e7b commit 3115538908e9344f4c881d5f6d5182e16bcd4e7b Author: Mark Johnston AuthorDate: 2023-10-23 15:05:50 +0000 Commit: Mark Johnston CommitDate: 2023-10-23 15:12:14 +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;