From nobody Tue Nov 28 21:06:25 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 4Sfw421wzpz52YgB; Tue, 28 Nov 2023 21:06:26 +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 4Sfw421VFcz3D5G; Tue, 28 Nov 2023 21:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205586; 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=F53wbDcvaGNaQiySNHoWkrPmEhplqCo2LcP7u42JdWw=; b=IiytKNOr+vczoQE3rG5XJ3BjEATWgc8QYxDLiXOZZY9A0EyIuLJ7lyAsI5STbviWXxkpQ0 DT8ndyAjPHxkFEt0Bat+Gym/Gq1m86Ibfkx8EQb6l6RjqNZKfkOQluMPJ66/uWuuFoIgQT Y93csKgaxmaxmDX1ouWXFkCtbGsvfvgZPigia07knqecfNvXciQXxTx+ziMZZ+cs6gcEfv rmqMLsldRBArfyZlkXAE+a7sAnawbV6rJ72uS6xgTVeenDOyzjaZ38MmKY006m36/yvuCX C59O/dWlM85CDygJflkm2hMmWdvjmmKDtJgzaAbQdWJhNwOa0GCujEevdyBKYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205586; 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=F53wbDcvaGNaQiySNHoWkrPmEhplqCo2LcP7u42JdWw=; b=OOkVFQOtHipKVNpUlYDqgHxmvQjzaLky81n8zwvOG//j/ab57iaDMpdMidBxVMdkmubr6g gIOOC48vq1YISPXeJ/BjFNAZOrelnuiPSDjsCyaKUNbVHVCzJ5hwu3GlvovArkdRk4gqXO pe0c/6WvfV1ZYV8mgBm0YLQdDdeTH+iHsYLEyjtLN1wPc9yKkxRlyNh1QA5qxrQTIrp+/A 2h6IGUziz+hX2TDsP8JOIGTV1nYRZen6sVO5r16rVGEKzrywkndtOvv8rt7EAZxD/O+nBy X8R2ZUxCOBWYHJRXGHaeOD6roO8yL2mIbIqWnZq5ZV6YN0bSSIDqGLQF0JEAXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205586; a=rsa-sha256; cv=none; b=AK7u30mqC0QEIfcllEVy8T/z3NC5oFxueEPtWuOg12pZpTm0SMKTut7b8B4RcMpYE6bHC+ rFxICSGHCatprcCdsFBK54tpwLe4ygpL0WkjJuLDFgegB+Nu395o/SaUz3TLav9+Br+Xka Fw7CIzedBJD7EdHl+CM906ud0Nc/obHkybSUW/QngdKdizRw/3/+P2DXvsE0f7O8ZnnsAj Fh4kzk2ItzPpQa6zod5P5VDHeHAqQv63d1UYw8e0lO2frwOQBjDvi4nohP8wGpcU8LrBRa 8xxMkdGa3nkV8GWhpeJTE8E86IMqyMX+3qphoTTHupu0HEZZ8ybj8U/yWMkqvw== 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 4Sfw420Yt5zdc2; Tue, 28 Nov 2023 21:06:26 +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 3ASL6Pqj082127; Tue, 28 Nov 2023 21:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASL6PF6082124; Tue, 28 Nov 2023 21:06:25 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:06:25 GMT Message-Id: <202311282106.3ASL6PF6082124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: d92e0d62c9e3 - stable/14 - zfs: cherry-pick commit from master 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d92e0d62c9e38058fd46c97beb08764538878592 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d92e0d62c9e38058fd46c97beb08764538878592 commit d92e0d62c9e38058fd46c97beb08764538878592 Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 20:59:32 +0000 zfs: cherry-pick commit from master #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS (cherry picked from commit 30d581121bb122c90959658e7b28b1672d342897) --- sys/contrib/openzfs/module/zfs/dnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 7cf03264dce2..ad9988366ada 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1764,7 +1764,14 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode contains any uncommitted dirty records. + * Checks if the dnode itself is dirty, or is carrying any uncommitted records. + * It is important to check both conditions, as some operations (eg appending + * to a file) can dirty both as a single logical unit, but they are not synced + * out atomically, so checking one and not the other can result in an object + * appearing to be clean mid-way through a commit. + * + * Do not change this lightly! If you get it wrong, dmu_offset_next() can + * detect a hole where there is really data, leading to silent corruption. */ boolean_t dnode_is_dirty(dnode_t *dn) @@ -1772,7 +1779,8 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { + if (multilist_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); }