From nobody Fri Feb 10 17:19:59 2023 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 4PD0q42D94z3pdwM; Fri, 10 Feb 2023 17:20:00 +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 4PD0q41kH6z3Dwg; Fri, 10 Feb 2023 17:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676049600; 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=hRcqjndOXoOPCin6WPA3EQG6VkLNFExDK+0SPubLT0w=; b=Tk7CDryo9191wrrb55bEDxigEXC52qN5nMC+vHTud/j7gvTxIlgu21RqcZiAX1gC+NmjAL C/nsxTdSVsn7R7W9NiupNV0Ec2cnVDNQEtUK9XX36twc86W7/yRfRdPHVCglAwB+MojDpd OquxyTDdQ+21iLt6efWGA69D4YFuQih51btt9LSC64jXeIioaqdZ2IGl7tIMp78DLyXKUB TiCTo6ujOVhFJKXyjxAp6xoXoTHlGz+dR4NHkw7HHS1KcEGc4VJ1aDGznt+yxogkAfkVDq 6BTVNj3oINtpCD9/7sGHSeRDDcLrMLEdqE3sbKUPYah82GlHpKinyRj53Kbe9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676049600; 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=hRcqjndOXoOPCin6WPA3EQG6VkLNFExDK+0SPubLT0w=; b=y30JUrVJ11e0MqYo1dLjlkOXYFPXsAkz6Ztd/tvJC/PS6+8rQk92M1C+HnVWCqCOWSvK1k E2SJg3sm10cxy5JK/OZOJDG6ex1aCTJWQP1WP6yW2JSqS3bPNNwvOn3wni/6HE6Yww5V3b MYrLE1JfVhHhlA2pbZE0N3B7ULsRU2ogtBa8nBzKOj3FinL7p8p1Fre5CyPTou37cFks5i IE65QqU+N3ZXSJlLJC0KAPQibZ0dA1WI21YvqASpBla7PR1wuZIIvl8Tm+4GaVrzor5FeV l6RDsJ5/BMfRNVaYTPn+FwXxyC6VP9N9jWqZr4tafTgM3biC0uGKQMypYBBmvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676049600; a=rsa-sha256; cv=none; b=KJ9gWaxJi5j4i9gv0Kf2IayvCKdKfs5M1bZDNSU72Vt3m5GuzRmz4D6FCqtHRAWC4wpN/K RpzMwGuZYb0jwpls6N4U+j/MdgXsTsLBF9G3n8LkVFevBY5wNmlL09qd7NRbQOm9KyJMSB ml/tMrPpWaXfhKQH9mlzN9zRXs972FjL+rVB+r2mZ4EQpCahZgUX6GrM9We6kQ/YtsTNB9 3L3D1YL0k2DP4IiKB1urULDocCly0lpkNExySJMw/7MEh2giaSXMzxCtueukCaDkgoWqSN 4fnaw8UfC5ciY6pzhPDHe5e1wPpVvhv9HRXyfME0qJH7Ti1BdAsY8DkC+lIwUw== 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 4PD0q40gPMzR51; Fri, 10 Feb 2023 17:20:00 +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 31AHJxCG059477; Fri, 10 Feb 2023 17:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31AHJxJV059476; Fri, 10 Feb 2023 17:19:59 GMT (envelope-from git) Date: Fri, 10 Feb 2023 17:19:59 GMT Message-Id: <202302101719.31AHJxJV059476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: af0435e16bab - main - tarfs: Fix deadlock between descent and ascent in tarfs_lookup(). 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af0435e16bab8d6afb7760dcdcc5344efd10c844 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=af0435e16bab8d6afb7760dcdcc5344efd10c844 commit af0435e16bab8d6afb7760dcdcc5344efd10c844 Author: Dag-Erling Smørgrav AuthorDate: 2023-02-10 17:19:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-10 17:19:45 +0000 tarfs: Fix deadlock between descent and ascent in tarfs_lookup(). Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D38486 --- sys/fs/tarfs/tarfs_vnops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index 99ff39d41271..7a04f891350e 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -165,6 +165,7 @@ tarfs_getattr(struct vop_getattr_args *ap) static int tarfs_lookup(struct vop_cachedlookup_args *ap) { + struct tarfs_mount *tmp; struct tarfs_node *dirnode, *parent, *tnp; struct componentname *cnp; struct vnode *dvp, **vpp; @@ -180,6 +181,7 @@ tarfs_lookup(struct vop_cachedlookup_args *ap) *vpp = NULLVP; dirnode = VP_TO_TARFS_NODE(dvp); parent = dirnode->parent; + tmp = dirnode->tmp; tnp = NULL; TARFS_DPF(LOOKUP, "%s(%p=%s, %.*s)\n", __func__, @@ -228,7 +230,7 @@ tarfs_lookup(struct vop_cachedlookup_args *ap) (tnp->type != VDIR && tnp->type != VLNK)) return (ENOTDIR); - error = vn_vget_ino(dvp, tnp->ino, cnp->cn_lkflags, vpp); + error = VFS_VGET(tmp->vfs, tnp->ino, cnp->cn_lkflags, vpp); if (error != 0) return (error); }