From nobody Wed Oct 25 15:03:16 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 4SFscj1LRgz4xcql; Wed, 25 Oct 2023 15:03:17 +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 4SFscj0fXhz4RXf; Wed, 25 Oct 2023 15:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698246197; 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=+uJIayYw6fXb6/0edd3lBhuaUQTQAljCr/DLt2Csel8=; b=wjX82PXsIfxvYiAF0RqVgB1DAAO8sNFQ0gPtQodxL+j0RORvqCrswV8Lgpu+cHXWx/MKiN xNnuD5PCrRcNJ6nGC4uAv0XPfzTD0W+zMlTcBehLcC5LnDuwFHurGgp/4NQsZ1al7GMDZu c69B9gmrR23jcowGgujiaaTrwytuJx0B0XCPuKLIgs2EbQ69MYNu1UISRCjrUuhD2p9uJN Zlid+GMAhf0GueOa7oA3NnvHT6JPWq5bcGxixatWrvcK/BxoFNP+l6xax3ipUUCRhZeBOB l0HTiWdMBYkBM5mTB5X4LMswjm88fRaz9LrYr6UneE7T119wIyOr8ujcV0PiGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698246197; a=rsa-sha256; cv=none; b=BZBQZzxXd69/lIWx0p7ha+Ircuf9zHDdLIgp7ikPGrWtKiCAl7T7Nora31ZwCEfnJFGLqW xCMOQsJ6xHRhUsd44hatUFkBo5zbA76RspVMDTdnTNRpYLZtPhKXFBAPvI8B+EC3Q1QV+6 EnNmZ9LfFDyp298oZGZG5D7ZUQ/d0AX9aSZ6HNu5p5NjM41WXxbCicRo0Hv4HRxwOTa5Dc bu0pw7FBs3R/ZjIqhC1jAA2tJAVwfytrdBt7PL9eKBbSKYPWKydC3CoPO0CdXeObMcJZX+ R/am88LjLV2LmkovmXWMXrk7tF0wgnpUeSfdLMP/pl73wMpUP3maFyhd2mJ9Vg== 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=1698246197; 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=+uJIayYw6fXb6/0edd3lBhuaUQTQAljCr/DLt2Csel8=; b=GS1klKBhh1QGCXMycrZqn/1hUwOZV15wLCmBMkFGke8yex8+Lqg83W2Hkb5E6oRosuZwjZ CbIoYVox6+k8MPscI6MY0og87IDHpAYMuHz8SWfLhxlIv2PyLf2h/dVbsO60iiJgBo7NVr eZLpq4q72aL8uZntWrLAuDpvGFehGzfQwgrtYIc0U9GzHSlnoXZF7S6CQXhRg/N14C+RKF jQ2lLoffHOV5xu0L2Owbd3ZI2Z9nJNHcUBefeMSXGTuQbRWiOroWejAM6W1tp0jPRJex4d Q4qw08ED/8wWyqJ7jpZDPwD0zJzFgB3xpkyHG6OgW2iMpwN/12ag2zvdkE7zHQ== 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 4SFsch6lg3z18Hr; Wed, 25 Oct 2023 15:03: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 39PF3G0s039016; Wed, 25 Oct 2023 15:03:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PF3Ghj039013; Wed, 25 Oct 2023 15:03:16 GMT (envelope-from git) Date: Wed, 25 Oct 2023 15:03:16 GMT Message-Id: <202310251503.39PF3Ghj039013@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: eb5cbd793e31 - stable/14 - makefs/zfs: Fill out dd_used_breakdown fields in DSL directories 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: eb5cbd793e31f9d656999033be54dac1a1107294 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb5cbd793e31f9d656999033be54dac1a1107294 commit eb5cbd793e31f9d656999033be54dac1a1107294 Author: Mark Johnston AuthorDate: 2023-10-23 15:08:04 +0000 Commit: Mark Johnston CommitDate: 2023-10-25 14:27:27 +0000 makefs/zfs: Fill out dd_used_breakdown fields in DSL directories This is required for the "used", "usedds" and "usedchild" dataset properties to be displayed. PR: 274613 Reported by: Mike Tancsa MFC after: 1 week Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs/dsl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index a9ab93a90c38..f7abebe2e245 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -482,7 +482,7 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) dnode_phys_t *snapnames; zfs_dsl_dataset_t *headds; zfs_objset_t *os; - uint64_t bytes, snapnamesid; + uint64_t bytes, childbytes, snapnamesid; dsl_dir_finalize_props(dir); zap_write(zfs, dir->propszap); @@ -514,6 +514,7 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) headds->phys->ds_uncompressed_bytes = bytes; headds->phys->ds_compressed_bytes = bytes; + childbytes = 0; STAILQ_FOREACH(cdir, &dir->children, next) { /* * The root directory needs a special case: the amount of @@ -523,9 +524,13 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) */ if (dir == zfs->rootdsldir && cdir == zfs->mosdsldir) continue; - bytes += cdir->phys->dd_used_bytes; + childbytes += cdir->phys->dd_used_bytes; } - dsl_dir_size_add(dir, bytes); + dsl_dir_size_add(dir, bytes + childbytes); + + dir->phys->dd_flags |= DD_FLAG_USED_BREAKDOWN; + dir->phys->dd_used_breakdown[DD_USED_HEAD] = bytes; + dir->phys->dd_used_breakdown[DD_USED_CHILD] = childbytes; } void