From nobody Tue Nov 28 21:11:47 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 4SfwBC6Blqz52Yw2; Tue, 28 Nov 2023 21:11:47 +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 4SfwBC5kC4z3FmC; Tue, 28 Nov 2023 21:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205907; 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=C1j5wD2G3s20ggRieql4Kmr0UWn0q047VGcBMJ69OA4=; b=gdDyKGtxQsco5MDWnKH6W21JyKD2miz8+Qydw7fjpkh5L5Z9tewplqywBtjXw5/fx1KffP cuQG5/ogI5Yuae4KPgT2o7D6BQQQiBj08iJo1bdRytS8cjHioO0SmTrLspKDj4zO8Smr+v nGh9E1UKYGUWYXYqzHBDHMdjGJArNrnifSR1PSUc+c+bEp8610IlNv29ECdzFEnvnfSHk3 mBdtw7juB/SKJ6GfIarX9Nzyo5+fn6ZvqFjo5BkGKAkcSOY1ytUnxe6+/1ikmBbjbRiS1m LeQUYE+PWGaLpREhMUvzaOJXn6iCwwWBxm2ngm4LQ3KC9L299JuvsroGYmwEYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205907; 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=C1j5wD2G3s20ggRieql4Kmr0UWn0q047VGcBMJ69OA4=; b=sHEq9OQKPOkme/zG/U9xkqdsnWXLXpnR+KJkV4iEWKkUbYxh7/Ico+qec9A1C9i9dzc9CB fU9ro/jwS0zVQFpm1lZHUneDNQrgxmt8bceJzspgmZ7HO2YBVHds2k3/JP35xLL1cWC05E tlTatH7wuhBiWcsR18XHG9fflhvqVpt34PXm3AyC/bX6ucDln+P/r+NsIESraUSsIn/NbH hYkSGtBn/xa8WTK4mBQBcuqzb4FHuIDXzCJGBlX2m7Cd9WlCgoTkjbDAHG5Ep5T1BixLFA F6a0YWzb/0nbqUxzplZvhWl6mf+DQkAcSSOO18AADlQdB3UEgP4AjMM8Zj8J5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205907; a=rsa-sha256; cv=none; b=MJL18pnKslT9z55ttbCBE7unvyioK72/+2WFJoW9WLQ3cMpoizwESludJbzXRlVdr2599b 9QaZ8pLsqxy5SF2e2YnS+3GNa5Osh3Ozcfjol+d3ueIXo54DRwBpxEtqhHeDkLQUshEeAp SvMy8TouqShUONWKvGxLB0Lk7z4zto/mifo8frU441mD3lWTwNtNirF9AeghQt3SpPeVwZ 1FRaL/cNLCvNL+Jofy+yPm5NVbKvm1YmcJODNQSUHMlHynAoXkH1qoWSDzszMyaJnle7xm Y2b+D7PDgZPBY0bzWMsvf6uq7xKVr4Qv9TkKpceQvU4WsVVE0olFjbNeEY9OKQ== 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 4SfwBC4nXdzdWX; Tue, 28 Nov 2023 21:11:47 +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 3ASLBlvN097022; Tue, 28 Nov 2023 21:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASLBlnK097019; Tue, 28 Nov 2023 21:11:47 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:11:47 GMT Message-Id: <202311282111.3ASLBlnK097019@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: 5858f93a8b66 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 5858f93a8b66aa6331d99bed6aad68bc7e9648ba Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5858f93a8b66aa6331d99bed6aad68bc7e9648ba commit 5858f93a8b66aa6331d99bed6aad68bc7e9648ba Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 21:07:30 +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 a9aaa4d21d2b..efebc443a210 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1773,7 +1773,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) @@ -1781,7 +1788,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); }