From nobody Tue Apr 18 01:35:43 2023 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 4Q0mhb4FdKz45V8T; Tue, 18 Apr 2023 01:35:43 +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 4Q0mhb2TJDz3K6d; Tue, 18 Apr 2023 01:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681781743; 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=RAK/9ZIrEyVELRYNr1wcyvdr0Pv+KQpFbvtPBL7N0pk=; b=eD02kh48/rF6HPnM7M0xIpNWAbavaFHsJlJn5hvY2y5q44qkq7K2V97/Yv7vq5Dr6kGpCX A+NvgZTDRld2yKI3c64uW/z2hvOueUK9KjsKGBP4jpwp/rvOszEp9ShVE4YBAlywhn9BId nLlhQgk80M1jPtHg8BKD8YlQKV1fR40O6BaP4G9nfvyxRiljZf3wKnEPkh52j3gF7l6EIc 0XyuJyJZYU5C2DGYE9uEzp4u80J+QlRVkAFKTrBdiKJPCenR5bPawRTtVs2cXxujszNa24 yl84AGPDI9qmiVSCTjJvfbC2K8KjYn/x9IbfAuY6mJDFUdnhVgyAnzssIbVRjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681781743; 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=RAK/9ZIrEyVELRYNr1wcyvdr0Pv+KQpFbvtPBL7N0pk=; b=yCVS+EQze6kgZC5dtb3jBIzMLbC7xKXWBi7Rvlyk2EzafC+1zEVd4qFj2xv+8/rjX4Dvcj 2eJ54v3cObIDVeembIs1JuRA85rIruRF7f6Ewr8NOqW9kHuRVVbIVMyasaIOSnqsfYOJ7S h0S87Ty5k0dYNmSmTX/8Hv5ts1L9nq8pUgRPGhLAG4wknaHqUsnCZm6/BUaONp1xGpdX5o GbRt1ojZjeNwmSiX4ttRdoT0nxwfzHmLYo+ni1QwJ7/lRQimMpcRWS6NnUUqrvI8GNFaS+ EWoAz7byAn4yHEsETFntd4RQdZ04NkGzcuveUS7cVvmZY1TpArklUKBtQdRJeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681781743; a=rsa-sha256; cv=none; b=uF/V5bCwrFySZqoieldsbigor3BxhcTKXgW98u1szNGnAD72PMHc+0EX552xyA5t9Yk2Wz 4hGTfqm09bhXvxGTbTk7jOvR8oZ+nPMSZhaPD8bOkPfg/DH93qiWYJuhkXtvQmXLLdIvV4 vacORam63YGd8XjigChbKLUGpAKniXvdp4FsMmY/mfvNla8bwec4cDZPYKHnWb/Vc2sTZp 79O2PISyzLyAxa6LE1yStXNYhH+jnPks32xv2Y+ZBmC6E+h588JDtViapEkOhgujcQx2QZ XaJtqzIw2Za9CbJAnWuLZc4gk1jAlBD6j49Q71TrdsKZzUdauq6CY1Lqj96V3A== 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 4Q0mhb0rhYzsKC; Tue, 18 Apr 2023 01:35:43 +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 33I1ZhGw042419; Tue, 18 Apr 2023 01:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I1Zh18042418; Tue, 18 Apr 2023 01:35:43 GMT (envelope-from git) Date: Tue, 18 Apr 2023 01:35:43 GMT Message-Id: <202304180135.33I1Zh18042418@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: a5d82b55fe76 - main - Remove an impossible condition from unionfs_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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5d82b55fe76307df5277caa4bb1b7963a405e34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=a5d82b55fe76307df5277caa4bb1b7963a405e34 commit a5d82b55fe76307df5277caa4bb1b7963a405e34 Author: Jason A. Harmening AuthorDate: 2023-01-16 21:48:11 +0000 Commit: Jason A. Harmening CommitDate: 2023-04-18 01:31:40 +0000 Remove an impossible condition from unionfs_lock() We hold the vnode interlock, so vnode private data cannot suddenly become NULL. Tested by: pho Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D39272 --- sys/fs/unionfs/union_vnops.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index f78e653280a4..a0ff5c140e82 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1982,14 +1982,6 @@ unionfs_lock(struct vop_lock1_args *ap) vholdnz(uvp); uhold = 1; VOP_UNLOCK(uvp); - unp = VTOUNIONFS(vp); - if (unp == NULL) { - /* vnode is released. */ - VI_UNLOCK(vp); - VOP_UNLOCK(lvp); - vdrop(uvp); - return (EBUSY); - } } VI_LOCK_FLAGS(lvp, MTX_DUPOK); flags |= LK_INTERLOCK;