From nobody Mon Sep 19 20:05:26 2022 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 4MWbJQ48Zgz4chRR; Mon, 19 Sep 2022 20:05: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 4MWbJQ3QWSz3vhm; Mon, 19 Sep 2022 20:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663617926; 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=zQ0cesZe5X8YE2tMBKz/wLUyrYdMy7o1aHO5fIWBvJw=; b=LcR2yAvxSEQZnqiUhvKXW6Pv4t3k1Ek3jD0JZpASGgVUC0LsCBTvxeQf9ounbvipi45h1A yFievKcaYRjsq6e09Cdwb1c/fzdXD4AMiavcMCWVMd5Bq6FEWCAFXnCTvRvv/ypJ8n52uv 9iL+lHCbIstzwitSiWX9/3P+LtNo6GkVig3XBU6galZRxHQBa+Sm3fAn/8Su4CshKuM0qb fonvL+jcUPPm4m4PMhbnfU7ATFgga0Id28HK/LWrFTalmQXsDo/Zdj560Dxjv6NCbiCWPp i0LoLpjCQTAvqU0txBY6s/ey5WoOMQJX6o4izaYgR6gvi3waZu7PITUxcRpG/g== 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 4MWbJQ2NZ3zV5Q; Mon, 19 Sep 2022 20:05:26 +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 28JK5Q9P074601; Mon, 19 Sep 2022 20:05:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28JK5Q0m074600; Mon, 19 Sep 2022 20:05:26 GMT (envelope-from git) Date: Mon, 19 Sep 2022 20:05:26 GMT Message-Id: <202209192005.28JK5Q0m074600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 4e1262ac9927 - main - zfs: stop passing LK_INTERLOCK to VOP_LOCK 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e1262ac99272db5c65f924acf9686876742c2cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663617926; 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=zQ0cesZe5X8YE2tMBKz/wLUyrYdMy7o1aHO5fIWBvJw=; b=YHHN8slbAhL4OnEJBn/fjzVCyRVpi+CbsMEqTlLEy5MwLoiwqcsJHC2OWRpEhTWrMOnngT AZcrY2uTOcR1fPcqmqg7D3MgIFBKwLj3JwYe1TAXBu/OxoTp40RJ/0399bV2ndpUNkxfW0 LWo2ZDqysLqAd1hnIh4KvLuMMMPFpvUJ02Dd2E8kpqoOkOPOhaTas0TJdgY9v2BVmruuhz 8vyabjFe8kNbXx92+nUNma7Jt9IccFVLkGPF9exxgCiUYXHyta8apxQtdYOo6fxJgWF+87 emT9DJlAKQqKNS1hNZO3HeZ8ZUTU8BLuJDhFo3NagRL/01OqQ9b9YHpjonK11Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663617926; a=rsa-sha256; cv=none; b=vYr4e1NkJD0Ta/z+1BzBYRXIXr5SL+k7AjLzXbjXyyCEpfDmXFQsgcfThYNmdV737mGfqi zIt3KrfTMHDHTTvOeCd2AKh15uUxQHQj+o5SPEueb+c+/fGJByEM4Ct4Vbpa8i9hMGn+eu X5YfVjxFEM6P4btVZA+tHDOuanNNvIhXRN7FItDxSGOAry/Ww5cTEzZYCwH8vePZTpjAaT SkIUqT39oK5FOeoaLRApEGceXWfrEOLCTKaTbj+U1QwCMlc/dIGMVLDaqxJfEFYwCUi3kt VzWNoFr2+8h4fDCn3h6yqpAiQmcfY/lyFdSR9z2esYyj1WmsWs+M8UZlgjdfYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4e1262ac99272db5c65f924acf9686876742c2cd commit 4e1262ac99272db5c65f924acf9686876742c2cd Author: Mateusz Guzik AuthorDate: 2022-09-19 20:03:01 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-19 20:03:01 +0000 zfs: stop passing LK_INTERLOCK to VOP_LOCK There is an ongoing effort to eliminate this feature. --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 2c35b74cd3fd..82f0ef335d38 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -977,12 +977,13 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) */ VI_LOCK(*vpp); if (((*vpp)->v_iflag & VI_MOUNT) == 0) { + VI_UNLOCK(*vpp); /* * Upgrade to exclusive lock in order to: * - avoid race conditions * - satisfy the contract of mount_snapshot() */ - err = VOP_LOCK(*vpp, LK_TRYUPGRADE | LK_INTERLOCK); + err = VOP_LOCK(*vpp, LK_TRYUPGRADE); if (err == 0) break; } else {