From nobody Mon Apr 17 09:25:20 2023 X-Original-To: dev-commits-src-main@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 4Q0M8w4LnQz45dDY; Mon, 17 Apr 2023 09:25:20 +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 4Q0M8w2pJKz3sF8; Mon, 17 Apr 2023 09:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723520; 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=JTVB55sfuR2W3vFZQvq1We7psXr/sZtSra1YD6vd50U=; b=XlpVgtIAJua1cP6EdlXhUaXzA3O9Pe2FleP0vjbzg4Sp9yh0RNxcEzExpZ80xpJ5lr8Zsx sxGoMK4BmSZn+l9EJLtx5CKEpHW11CYAe6oO5+hEdNmB2WeuFx50+kPXE8lpo6vYq1pZf+ MV6MlAkGXDi9dPTYSQMVEuhlBwH+QaAGCr1GcHhpCjveaTj7qHTGiBrfsTdRwM+ZrExv4U dcl7l6AnCdn5aMOqJnwslpu92UWkAE/KM+Xrhm4cbd6+eJAImlOm4RcrjVhrWy6qMUKA2/ 3h8KNd7UFwA3/SQ2LPE7AxT16Pj0xO35EtHuakUIjhD7wI7bjKlKjm1LaXm4OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723520; 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=JTVB55sfuR2W3vFZQvq1We7psXr/sZtSra1YD6vd50U=; b=dGBZKj0DiJc3pOMSKJ40GCEDcHD/cdFB2ClTDiFuLt5wIMtqmHG9Ac0/B9tXLVBvwTbOdI ez7GeFOKfSeSqWbEXzaBEVr010mD5dY3+uvdG79d9UMYR16Rj+B6Ot7md2jInlrIDkSDiE mATW50lXRW0GBBPcN6a5Os9IdR1EN9+mOKfLA4PhHewRhvz5o+MhxNVCzOPUWBuFi+xAQb qpiTQFix6UdsiLuM/LCHbGhJbk6g0pjnzACPVSSszuFFlXg3PxjgOuUkvayOK6hlElIoRe nZWVcQPfjIdBuY9imewHTQUYkrP3vL7oY1RPl/F53f4TLKmcnFQ0cTPt7R2p9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681723520; a=rsa-sha256; cv=none; b=FZUOLCOFpHTUYmO9SFrVmSmjqbFizky/w6rAHGy2EXDE5d5H56j8HP7/eZ8Rw50XK4SDkb PJ6Z3MRtAFXD8uUJzHraBXtyVMHf7Ncv5+etaVvArvSMSsYOHvW7xVk47aTE+ZauFRnGM+ zK/k74FemnsGlQmZ0QoEO1JeSVkfjYqZUD3NQHnv5h6mDWprxpL9OQ8kR00iw0H81uMOJD BaAib42+ZbF4MvGMTm1+L1AAjuAgXHs8zHPVGoDsnvM2FiYHYFHo+20tJezy0J5gqTbVlh IsO4S1NDevrClrRMm8zv6+JG98WMTlW0CkvsXilD1o+sw1TJX2/tjKjCW93jMg== 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 4Q0M8w1SdqzP2m; Mon, 17 Apr 2023 09:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H9PK8b042144; Mon, 17 Apr 2023 09:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H9PKPP042143; Mon, 17 Apr 2023 09:25:20 GMT (envelope-from git) Date: Mon, 17 Apr 2023 09:25:20 GMT Message-Id: <202304170925.33H9PKPP042143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pawel Jakub Dawidek Subject: git: 1959e122d932 - main - zfs: Merge https://github.com/openzfs/zfs/pull/14739 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pjd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1959e122d9328b31a62ff7508e1746df2857b592 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pjd: URL: https://cgit.FreeBSD.org/src/commit/?id=1959e122d9328b31a62ff7508e1746df2857b592 commit 1959e122d9328b31a62ff7508e1746df2857b592 Author: Pawel Jakub Dawidek AuthorDate: 2023-04-17 09:22:56 +0000 Commit: Pawel Jakub Dawidek CommitDate: 2023-04-17 09:22:56 +0000 zfs: Merge https://github.com/openzfs/zfs/pull/14739 The zfs_log_clone_range() function is never called from the zfs_clone_range_replay() function, so I assumed it is safe to assert that zil_replaying() is never TRUE here. It turns out zil_replaying() also returns TRUE when the sync property is set to disabled. Fix the problem by just returning if zil_replaying() returns TRUE. Reported by: Florian Smeets Signed-off-by: Pawel Jakub Dawidek pawel@dawidek.net Approved by: oshogbo, mm --- sys/contrib/openzfs/module/zfs/zfs_log.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/zfs_log.c b/sys/contrib/openzfs/module/zfs/zfs_log.c index d009c58d8644..50325907b0d1 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_log.c +++ b/sys/contrib/openzfs/module/zfs/zfs_log.c @@ -905,9 +905,7 @@ zfs_log_clone_range(zilog_t *zilog, dmu_tx_t *tx, int txtype, znode_t *zp, uint64_t partlen, max_log_data; size_t i, partnbps; - VERIFY(!zil_replaying(zilog, tx)); - - if (zp->z_unlinked) + if (zil_replaying(zilog, tx) || zp->z_unlinked) return; max_log_data = zil_max_log_data(zilog, sizeof (lr_clone_range_t));