From nobody Mon Dec 19 15:09:29 2022 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 4NbNQx3cQpzt9Ws; Mon, 19 Dec 2022 15:09:29 +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 4NbNQx30Y4z3CCK; Mon, 19 Dec 2022 15:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671462569; 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=Mn40G6hp6IRcVjOTUrRP7AFZT24M0bbhzoow7KVHfDk=; b=YYHy2Y6Bl1haXxxOYTGtisjNRrGMhFDxoz/1+/FBJsl64L3+YgjgVxyn7wovUiJrfhc3LW WkOMy5uei4B2sElq05PQdzgutp6TbW6IBi3RedvQsoxfsRRHWh6cQ0p9nEItRmZ8aTeVjp 46kMHtZS1gRwZHP+noafmDM/S3kXCf6HRAEWnlva0uCkU4HUlLh9tbT0ng+XZyQFYqpDQp 0+gCD4INpq94qHLPRsCW0UiNZfV2Nuw3nzGdTZ6USg2Qr89+0848i3g+89+VKTDSsWCKxr 2uvdkRDv+sLE3j2o4nkHUKz32vGldRh/n8sKrPjyeCog3J4cxFje2MtOlF+K9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671462569; 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=Mn40G6hp6IRcVjOTUrRP7AFZT24M0bbhzoow7KVHfDk=; b=jVzw9yw5H97Cu2JHQz8yvEInV/GwQEatEw/hjvAXQs7HzDIRcRS+AqXoe60BQoHJuMSlBK mlIvMErWWkxuBzyD4zESAHOmBCPVkueRP5F18fLMTgmtL1RB3ppl/x7c//z7otHLTc7FtC TpbrODT4J0EGs8rk6kXS9+DxHadb3UgY2Z1+iUylo7pHKPadVhiPahXvawyLRpOvTwvdq6 I9zgGd4gCvbgPR52UqxTWrg2wiWbBsEoT1+eQwCCw4qcr0+HqTtXFCaRkPgUj8o5ICJ3Yg R5cj6cOgrxeQoCA2pOEdVHjdjUf/+vpLEnXWCvCWx82PTRt4fmrx/xQe9G4Kgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671462569; a=rsa-sha256; cv=none; b=HAKTaw6jpV8WJFHct3PbUI68oWDzbDWY7KJcTNzqhJyip/YKA1RwaMomuZJhlulUoewht+ s31GxPLb3t6duRFecd4wPEuN9OD70tjiWCDztLl8H3/iNOYRgefyrDrA2lJUa/wS5SUBKr vYtsuNyIfKFSq98TN179aCM2BapfzekXcrxHX1xSNFh5fu2VmAS5oQPgwsggz7+GPbLfiQ 63zPcWsOMVhE+TES/hmUUZPKdLVYvsLYZm0q8pVJ5/bT9G91OCBzzimH8X5OTQo9SeN63Z YHh5svPNkYQ0ngc2EGaHct/TdsOGJsnjAjxT7J4OfXZh1zj610oHnaEV16wGIw== 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 4NbNQx1yBFz10XS; Mon, 19 Dec 2022 15:09:29 +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 2BJF9TqU042687; Mon, 19 Dec 2022 15:09:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJF9Tu4042686; Mon, 19 Dec 2022 15:09:29 GMT (envelope-from git) Date: Mon, 19 Dec 2022 15:09:29 GMT Message-Id: <202212191509.2BJF9Tu4042686@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: 10aec5991ae4 - main - autofs: whack an always-false branch 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10aec5991ae43cf1ae54c779789281bce120db86 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=10aec5991ae43cf1ae54c779789281bce120db86 commit 10aec5991ae43cf1ae54c779789281bce120db86 Author: Mateusz Guzik AuthorDate: 2022-12-19 14:56:42 +0000 Commit: Mateusz Guzik CommitDate: 2022-12-19 14:57:47 +0000 autofs: whack an always-false branch --- sys/fs/autofs/autofs_vnops.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/fs/autofs/autofs_vnops.c b/sys/fs/autofs/autofs_vnops.c index c06d6a24b9b8..7f120c4922d4 100644 --- a/sys/fs/autofs/autofs_vnops.c +++ b/sys/fs/autofs/autofs_vnops.c @@ -683,12 +683,7 @@ autofs_node_vn(struct autofs_node *anp, struct mount *mp, int flags, return (error); } - error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - if (error != 0) { - sx_xunlock(&anp->an_vnode_lock); - vdrop(vp); - return (error); - } + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vp->v_type = VDIR; if (anp->an_parent == NULL)