From nobody Wed Sep 14 22:52:14 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 4MSbFB32l4z4cPWn; Wed, 14 Sep 2022 22:52:14 +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 4MSbFB2HKbz3p8x; Wed, 14 Sep 2022 22:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663195934; 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=of0AWThL9kkpacliIlj97q8mN0dgVjDAeR1bBwnzAWc=; b=VqSvvRzbx6HQ3pzvmfeRHtUbBXlccMMnGkr5ChSTOuOrN9NcECFu7XUpHEtIGHrM+IXNLm NW3k5VOIc2ceJJmhKfB40a8SxkoIM7WbDPP31fa0J+gz2vaRlzWKnlPU0YBXOSKGggFmJc hHY/p1BFQGO/3H9Ca9+NYFK/pvS45MczHVTLFM90xjYLxZ+SaR2OFnv798HAokC5Ox71Dd uqyRE69qr4bN//M3hz/5q+s+S8qhPsGP7AnrxUIYNnYY9Xc0X82mVWDLPitYVk2himGA8o kBjrzxFV9cEGdzzjn0jxyYcZYJ4fj9GG1m4P+VpeEAkk+wsJ9aGzW0mmXl7J/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 4MSbFB1NyDzppW; Wed, 14 Sep 2022 22:52:14 +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 28EMqEvY031614; Wed, 14 Sep 2022 22:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28EMqEhV031613; Wed, 14 Sep 2022 22:52:14 GMT (envelope-from git) Date: Wed, 14 Sep 2022 22:52:14 GMT Message-Id: <202209142252.28EMqEhV031613@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: ad5e1f9c2d78 - main - devfs: stop taking the interlock in devfs_delete 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: ad5e1f9c2d78e75419b10e2f871c186d772ac728 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663195934; 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=of0AWThL9kkpacliIlj97q8mN0dgVjDAeR1bBwnzAWc=; b=Gok37C43UUJKiskgrPoa/dI0VPwb2iQHgp7wNyMvD0yG4OoJpmfUJNsM3FfLirFQx1JGpM t9KNiiPi45aH8gbfNksp1L9HcJyp53GkctZ28eS8oYglkQj6IsH+hqWuDrng80JO22qWQs eubG6cqfEqpkPhr5XyeFksiKfEuOARUhsWpEMhUj3Ec275zF8a85vwntm1TnWVQnv1gtXw RDPoAbXfl6pfLrO3M+q331uRnk3Jfzd0uI082IQMe59rBOr3NVQS1VwisXWDF+rol6c55Z DGNwTx1ODzl0OdpJxQ5jhCqUwUheSWEq4YUCyqVbbMFqcTkJ67DHMws0g0wY4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663195934; a=rsa-sha256; cv=none; b=Kyn4rAQpr5Ba273BTXfooCodUf/lnzCpPX1C3TKMiya95NNwoK5bElnHbriEcsO7SgWh6R UzL1HUmSlXmNFZD8rlbSINHmcDJxAH5niCKd5be2CsbrM6kAciyaJMAAiFpjB8Dd6m880Y odnA0VN7snxjeuWYWsFPOpujXnap6UkfGMtOn1h14Mw2aZV4y7c/mfrtSXKx3p0KUmu8wL 7mhEbf7J1iqIhIPG0P10GB05WmbhXofPji8GrNq6Kh3AToRLQuLmwMqjG4alCG38bKu2UK quQSQoQFssPDZ3tuZNZU279dU38vFhyk1dgUGMDqI+1+Jk4HuCtSY6VKHDUyRA== 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=ad5e1f9c2d78e75419b10e2f871c186d772ac728 commit ad5e1f9c2d78e75419b10e2f871c186d772ac728 Author: Mateusz Guzik AuthorDate: 2022-09-14 22:51:42 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-14 22:51:42 +0000 devfs: stop taking the interlock in devfs_delete It buys nothing now that vhold does not require it. --- sys/fs/devfs/devfs_devs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index e8786e965500..71950291bf97 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -397,11 +397,10 @@ devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int flags) mtx_lock(&devfs_de_interlock); vp = de->de_vnode; if (vp != NULL) { - VI_LOCK(vp); + vhold(vp); mtx_unlock(&devfs_de_interlock); - vholdl(vp); sx_unlock(&dm->dm_lock); - vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vgone(vp); VOP_UNLOCK(vp); vdrop(vp);