From nobody Thu Aug 10 08:35:16 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 4RM0c45Qrsz4TpCZ; Thu, 10 Aug 2023 08:35:16 +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 4RM0c44yyxz4VGc; Thu, 10 Aug 2023 08:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691656516; 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=u5XwZ8e57WX32ASQGtEoFTSsvUwmDoCZI02fbdqYT2E=; b=m7OTKX2O2CZmgt82a0wq1G0ylehQNCsQPfwWCi1NUebFC0q76PvUx7znsZgnyA4Ll0FITN LKGfGTC0TBcgpCUJkEHCHpQzDpC3DxgWqe8OToeXoHYBXUhhC57MYuEeMD/Dj1KkJDMtdR EPNVWTaDRmy0SF7ciwgR4AgSzB296CAfjNlpNksU+nenRmJMZ/H+TzghgjIxp4neHLRJA6 JgoVjl8bMjKpCe1UgRKU/kwyEWwiZM1Kp9YPLAVzi+J0CrQUNxH9FTJp8c6DP/UhWvtbfq yLdrnsrpoe32P8YLaWWGS6bcgq2pkbi/SfFDiqWiCsAlHprfTfw1pA1M/10g3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691656516; 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=u5XwZ8e57WX32ASQGtEoFTSsvUwmDoCZI02fbdqYT2E=; b=hdkbzub0QvB6hB1UM5cAd0U8qlzVHXiQx/pFeORWdPTSezZSxXKXc9zTS9b3C4SAs/9X3+ 0GOvlfkVUkofWI0ACeviU2vQW6D0osWntbuxFTSfLsgWS0ldtvSj4EYUJEIKE+/ElZlUFh 6TLrR8k0MWBlPCTlBYuxgMIpMRmrSN2KErMFflD1dn1Cd76cyRldgGcfnbhsvVJ8N+dTiy d3FOGcMubOuuEZ1xYqgUu604eiyS3eXETQ8BgFPxhwV82kpPCkXGr/gUkBSNDrQGu4f/Lu ptbz9B0evUBn+wdAob+9XiDP6X1xzT1tgs/QWrupx1pk7cfFRns55aukkfXsMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691656516; a=rsa-sha256; cv=none; b=q0ObttriCHYLoTCwTg4O1F8LXf0u/PjcNsKJNVEYUZqMELZiGxkBG3EECxwn94MRYBlTPc Ql5qGgaLZ9tYDQGEJzGzWHrAM/U7kZC3VDMsjI3ymsz+7FYNTrJhLeX4wu7n3VYI85uvfV TtWH0pfZ/0DKNEy6DJSQUnfklFVnta+t2GZ8prSSDZ9PCpLU7gsBqga/VUoYXzFj2AmyD7 bIEh7SuYU48FrYWRYL9Ktl7koE9L9bsG08QuDb/+2NkmGRy1ZgwVSsxC468t7KVMwhp87f uQ44pHwGywiPDsKkQmrGLKorbMfk5PAU4MK2wseON6k1Q7pWwQIv4IGF2fmERA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RM0c441snzqj6; Thu, 10 Aug 2023 08:35: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 37A8ZGoX042591; Thu, 10 Aug 2023 08:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A8ZGqx042588; Thu, 10 Aug 2023 08:35:16 GMT (envelope-from git) Date: Thu, 10 Aug 2023 08:35:16 GMT Message-Id: <202308100835.37A8ZGqx042588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 28d2e3b5dedf - main - zfs: cherry-pick fix from openzfs 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28d2e3b5dedf24938e5ec0806084941510621f13 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=28d2e3b5dedf24938e5ec0806084941510621f13 commit 28d2e3b5dedf24938e5ec0806084941510621f13 Author: Martin Matuska AuthorDate: 2023-08-10 07:59:39 +0000 Commit: Martin Matuska CommitDate: 2023-08-10 08:11:52 +0000 zfs: cherry-pick fix from openzfs Vendor PR: #15103 Remove zl_issuer_lock from zil_suspend() Obtained from: OpenZFS OpenZFS commit: 2848de11e516a2ef2e6baa574a60d77a6fb47023 Note: full vendor imports will continue when stable/14 has been branched --- sys/contrib/openzfs/module/zfs/zil.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/zil.c b/sys/contrib/openzfs/module/zfs/zil.c index af7137faaccf..be5b9edf6ede 100644 --- a/sys/contrib/openzfs/module/zfs/zil.c +++ b/sys/contrib/openzfs/module/zfs/zil.c @@ -3941,13 +3941,11 @@ zil_suspend(const char *osname, void **cookiep) return (error); zilog = dmu_objset_zil(os); - mutex_enter(&zilog->zl_issuer_lock); mutex_enter(&zilog->zl_lock); zh = zilog->zl_header; if (zh->zh_flags & ZIL_REPLAY_NEEDED) { /* unplayed log */ mutex_exit(&zilog->zl_lock); - mutex_exit(&zilog->zl_issuer_lock); dmu_objset_rele(os, suspend_tag); return (SET_ERROR(EBUSY)); } @@ -3961,7 +3959,6 @@ zil_suspend(const char *osname, void **cookiep) if (cookiep == NULL && !zilog->zl_suspending && (zilog->zl_suspend > 0 || BP_IS_HOLE(&zh->zh_log))) { mutex_exit(&zilog->zl_lock); - mutex_exit(&zilog->zl_issuer_lock); dmu_objset_rele(os, suspend_tag); return (0); } @@ -3970,7 +3967,6 @@ zil_suspend(const char *osname, void **cookiep) dsl_pool_rele(dmu_objset_pool(os), suspend_tag); zilog->zl_suspend++; - mutex_exit(&zilog->zl_issuer_lock); if (zilog->zl_suspend > 1) { /*