From nobody Fri Mar 24 17:47:44 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 4PjqRj4NL2z40sjt; Fri, 24 Mar 2023 17:47:45 +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 4PjqRj14CBz4TdQ; Fri, 24 Mar 2023 17:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679680065; 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=reIfZwv+VwzXOSH+DBHgbSbpZwu57xzZy83/keAWYCY=; b=oewpoj2/CIwsvANWg6TDx5+Bqp7gEHNcjxJbUeg7RJOrvIa9JoGuZQMF4lYGxDYu35kDP1 za2J8Lw5XhKf02mMEuUYdeBbBo8n0gXw6PCl1BuIgIBaSaXh0U5G9L3qDYFKccm+C/n2yx RNumowBfoG+VppKv34XZ743thSVG1ivWYBLLy+gd04a/eUgPxn4oPrE00oFC9ZqLG9KRSk B6Eo/Px6M/dF5r3OwOIDKtr5rH//78wpriHV+BMueANfLoWDTPw9gJ5hDMCx/3y/WrYwUr 27nHQUMc6dX5od0DQJ8W4OGQjUzro2g0YDbwFInhX+BzQC3Oy4NTDunlW94kmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679680065; 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=reIfZwv+VwzXOSH+DBHgbSbpZwu57xzZy83/keAWYCY=; b=RIRz+e3JHzzm/eWjMA6zT35aY2YpdmvsA1LcHLkbMj3qGLpd2lDfWMXIp7xjONJvNUDWDF P3RRcKjdehcU/jKT3tTzCWJeVwFYGzdAzOd9MCfMEyhPGMUFOJxnD/kAYbpRPO7MpoxAJm Q4zavceGkavhIZ0POu9NqCeImrkvPHWl5YZqQOpHg2mURYwhD4914C1UjijjxpASDCGwtf iz7V9r6ahONZKH/CEXKIhissvvO2N8dY94h23/RxcW17aSab2br1bj7QrQcEEwm1Y9jjKL VhRL2UXIcvh4NftJC74V85/71ykLNaxRkfFlQs2crONA89ZesIu3cs/3PT95OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679680065; a=rsa-sha256; cv=none; b=AhAeL1i/H68Jb67RJY1QHGMroVGYOSLqnK/Xl1gu+3m7eP7x3s8Jt4zR0Ez7PG9fnA3ncu dzKQV0sqyMmE58XeR6RcmyGsS+N1jEZCexDeVs6MvcPuBYmUatX7CviL5Y9DOvq8spgZXb e7Xx1+J1YZaEAeTd99G9kTRFN1EA8MVmRb4g2WAbkSMLJnLypIXjMPd7Ru5tWigd7FJtTE ZaQt1tjaLZzww2uEGlWoMoaG7EceMcpvZUnzUTKb+3ni+gDBfN37+twKcdWW1I4RSUionR SOM6mMixwXjgEmHFYTrczuTcXOS6V98BVEZmUWGUqQcNrLi4GCfHlqu9m7RtEQ== 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 4PjqRh73SgzRpp; Fri, 24 Mar 2023 17:47: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 32OHlinD075549; Fri, 24 Mar 2023 17:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OHlikG075548; Fri, 24 Mar 2023 17:47:44 GMT (envelope-from git) Date: Fri, 24 Mar 2023 17:47:44 GMT Message-Id: <202303241747.32OHlikG075548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 13262b07a069 - main - fdesc_lookup(): drop fdropped 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13262b07a06910edd5e58e6bb2e1d4786a7b7d8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=13262b07a06910edd5e58e6bb2e1d4786a7b7d8e commit 13262b07a06910edd5e58e6bb2e1d4786a7b7d8e Author: Konstantin Belousov AuthorDate: 2023-03-23 19:30:04 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-24 17:47:22 +0000 fdesc_lookup(): drop fdropped Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39207 --- sys/fs/fdescfs/fdesc_vnops.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 2713b070426c..1c4b6d0c6cdb 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -291,7 +291,6 @@ fdesc_lookup(struct vop_lookup_args *ap) int nlen = cnp->cn_namelen; u_int fd, fd1; int error; - bool fdropped; struct vnode *fvp; if ((cnp->cn_flags & ISLASTCN) && @@ -335,7 +334,6 @@ fdesc_lookup(struct vop_lookup_args *ap) */ if ((error = fget(td, fd, &cap_no_rights, &fp)) != 0) goto bad; - fdropped = false; /* * Make sure we do not deadlock looking up the dvp itself. @@ -351,19 +349,17 @@ fdesc_lookup(struct vop_lookup_args *ap) arg.ix = FD_DESC + fd; arg.fp = fp; arg.td = td; - arg.fdropped = fdropped; + arg.fdropped = false; error = vn_vget_ino_gen(dvp, fdesc_get_ino_alloc, &arg, LK_EXCLUSIVE, &fvp); - fdropped = arg.fdropped; - if (!fdropped) { + if (!arg.fdropped) { /* * In case we're holding the last reference to the file, the dvp * will be re-acquired. */ VOP_UNLOCK(dvp); fdrop(fp, td); - fdropped = true; vn_lock(dvp, LK_RETRY | LK_EXCLUSIVE); fvp = dvp;