From nobody Tue Apr 18 01:35:44 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 4Q0mhc4J77z45VlB; Tue, 18 Apr 2023 01:35:44 +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 4Q0mhc2ynDz3JrG; Tue, 18 Apr 2023 01:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681781744; 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=s3bru0cd0qXbf6L8cpXtRthetDqEmVV26Zv0Gm1y4js=; b=FH4jQY9Z8QjMeexihaNCxXURauw52wSnyHK+Yrim9LsT22xHxn4TSY4GS91REL89lZ/CYS nksG/zkJZ0RigA9d0w0dBc50eHncpvDbnPqgpEzbhrlawyw8njX861yKH2Sciorq2L63k6 N1cHELukIF7Kw2vfmTRekMw6rNslNgpKxqSP+44xwDbY2wRIRlAq6L2YYZbXSbLZ395MsN 41H1uiivPCliNveX5S/Jhk6de5IldSqUOTB+f3bOegMxR41tFBgqvNV7b6y2sCmh5HncXj ZOwJxRxdA4y8jb/25bPC0+8ZNu5u1u7mt6ezvIZKl1K72yVjVCWagGu248hkUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681781744; 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=s3bru0cd0qXbf6L8cpXtRthetDqEmVV26Zv0Gm1y4js=; b=sno9XLdwmRRGY/jGMsuxOI0i7aHpAaAuSq9Ggp0b83UcrSUq75XfLdhOZvoQOV4duiVIK3 uM9m5OmifP3067FSS2Fh4LOrd9OhHjlW7DeU4eXJOug4uTRxNzjklDqcwJH3zbEnzkBHL4 sGVAqQfyoHuEt7OfDoMsKzNqwuIPxavnHe/tMyjK4Qi3nNxbU9CxgBJUmnUPZg+lBuql7C REruZOX2sdH+c3DgembpNNOc9zE4/Dp3udUiIRylpD0DKQ2ABU1LPX/UzTUT3U5ng4ko+a h4k2w77Ad3YMP996YB5jMyp0Yjy2V/hU+WlRB1zaEyqNNj8he+9KJjCWwLlfnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681781744; a=rsa-sha256; cv=none; b=fjiIwaItifhDgmQ+V8cVy4CdM2EYFjdpmlly9G6EuU+EQz95oAghUBYC1s/7yXZJ7bGbiC xdSJEO75Ia6+tvg1DL5hflSVUBmpWPAEHJ8kIKveQm8vmrZ+hdrh+G38HVMBK7gZDHpYy9 mC/J9Ui1gwnfyMq02KxMtF/Uw0u+WzOjzHvdTVmn3fsO6pAnsFhlCZvbFw1BvGDnS0TEAP NX00MBSvEfksvsGVutSB7N1d58LIw/glyLy39JuuvNRCqQdzHtz4Dzy0/323FEjSl/gedt Wa//pamV+pjk4i1m8l1SyP/66U+K77SfUh01cRYz7vWdMjoGXW2f5bdO0Ox9JQ== 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 4Q0mhc202bzsKD; Tue, 18 Apr 2023 01:35:44 +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 33I1ZiZ6042440; Tue, 18 Apr 2023 01:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I1Zi9l042439; Tue, 18 Apr 2023 01:35:44 GMT (envelope-from git) Date: Tue, 18 Apr 2023 01:35:44 GMT Message-Id: <202304180135.33I1Zi9l042439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: d711884e60bf - main - Remove unionfs_islocked() 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d711884e60bf55c9572e1882ed1b4645a4aa1ce6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=d711884e60bf55c9572e1882ed1b4645a4aa1ce6 commit d711884e60bf55c9572e1882ed1b4645a4aa1ce6 Author: Jason A. Harmening AuthorDate: 2023-01-16 21:50:10 +0000 Commit: Jason A. Harmening CommitDate: 2023-04-18 01:31:40 +0000 Remove unionfs_islocked() The implementation is racy; if the unionfs vnode is not in fact locked, vnode private data may be concurrently altered or freed. Instead, simply rely upon the standard implementation to query the v_vnlock field, which is type-stable and will reflect the correct lower/upper vnode configuration for the unionfs node. Tested by: pho Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D39272 --- sys/fs/unionfs/union_vnops.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index a0ff5c140e82..0da5ecb61bb2 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1852,24 +1852,6 @@ unionfs_print(struct vop_print_args *ap) return (0); } -static int -unionfs_islocked(struct vop_islocked_args *ap) -{ - struct unionfs_node *unp; - - KASSERT_UNIONFS_VNODE(ap->a_vp); - - unp = VTOUNIONFS(ap->a_vp); - if (unp == NULL) - return (vop_stdislocked(ap)); - - if (unp->un_uppervp != NULLVP) - return (VOP_ISLOCKED(unp->un_uppervp)); - if (unp->un_lowervp != NULLVP) - return (VOP_ISLOCKED(unp->un_lowervp)); - return (vop_stdislocked(ap)); -} - static int unionfs_get_llt_revlock(struct vnode *vp, int flags) { @@ -2790,7 +2772,7 @@ struct vop_vector unionfs_vnodeops = { .vop_getwritemount = unionfs_getwritemount, .vop_inactive = unionfs_inactive, .vop_need_inactive = vop_stdneed_inactive, - .vop_islocked = unionfs_islocked, + .vop_islocked = vop_stdislocked, .vop_ioctl = unionfs_ioctl, .vop_link = unionfs_link, .vop_listextattr = unionfs_listextattr,