From nobody Thu Apr 06 18:04:31 2023 X-Original-To: dev-commits-src-branches@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 4PsqC36MGcz44fQg; Thu, 6 Apr 2023 18:04:31 +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 4PsqC35F1Kz3Qpq; Thu, 6 Apr 2023 18:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680804271; 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=hEbhtR19oiAU2xhX3aobmaXNQ2/+1GUTjCN/VlbqtFM=; b=SdCFw6DX5ofpIpxpgJhdhpd4k/ZS3mhS8KCfkpb1RWGkkarR5MNnqWZDMstXQzqnPHWctc 1NJMlLlEVyM1rSdBwLHY3pOv1wuj6N4KQJUBINSEwCwLGQPVjWwe3KMdWU11DDnJkpH5sy Lq7PaBFaRxqZv2tBUsrjnmBfpwjZCHqDK8OtzcTstfHRTF2M+x00yMbRbZFHS05GiwlFyp sitzASZdHwdfe3PyqMNiRrc4du/uJ+dXoLV6apHcRgSfX5YTbLwMqh0++CzrEjHAViA2xJ 1BKR68gEIRZHwCp3Fl3bcKZEukT1T6ONvxYPW+qb7eNfWvYQC9Za7x0gspIUUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680804271; 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=hEbhtR19oiAU2xhX3aobmaXNQ2/+1GUTjCN/VlbqtFM=; b=SaqAL8QHViEpvFx7aXThhUYz4expsZNpij2vtmdF6guaJMFoRPCyHAQh2MqB6s2wcCr9PF b21up+Y3p3uUaGHokHS+UFbuAmVXx1eT8MpFSH6wwPqYy2DivHat5zNRBRWRR35MY7YW+N Kat59pJuPwxTS7dON8g9nVqg3Ue1yQHESoJ+jSDgA9HplwY+ASWMg5CTsZK6fiPZ7fYc+D Lpw0zBE5/crtzxJPQWxGikGAPU42axRWTK2oDl6Dj+toaREeAdk5Cl8ZMXYts/JvyHfLRc jHAZcSKOYlyee+I7ndyvwInqK3eDc4mm9JJ+EXApnrlyHvmtz5wgU8JxypQeJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680804271; a=rsa-sha256; cv=none; b=bmdYwQTHmWlnr9uWwloBDREGccglABqDf+5IaJcrfY/pGYXkbwjGQRQTBdp0NdUdBMeyaV DWMb4itdBZcVnokOWdUz/lHN15MOp0e2vZtilGJ04ipPo70QHiWkCWGVv/a0ykXdwEIyXA zgkq6/ZCC+8TbRBW6v+afPTOMgJ7BFZqkgxp5B0iMbS9xGRbJ1MyMNKNMPHpw0sqPz/VK2 PzdaCaDCpIA583vylPfV374HSu+N+5DwFtEmVC6Ro4Cg/IZx0cJs4cY363x2mvogotzQKF a9s6u3CVoMHi2oMQt6grVXde9zdyjwlWLWIn4BIifgNN42qA6kMIUGdqaajscg== 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 4PsqC344ZmzDvq; Thu, 6 Apr 2023 18:04:31 +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 336I4VEG010723; Thu, 6 Apr 2023 18:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336I4VLJ010722; Thu, 6 Apr 2023 18:04:31 GMT (envelope-from git) Date: Thu, 6 Apr 2023 18:04:31 GMT Message-Id: <202304061804.336I4VLJ010722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4cbd728cb153 - stable/13 - fdesc_lookup(): drop fdropped List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4cbd728cb1535b850e9db3a965bfda6a6629bba8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4cbd728cb1535b850e9db3a965bfda6a6629bba8 commit 4cbd728cb1535b850e9db3a965bfda6a6629bba8 Author: Konstantin Belousov AuthorDate: 2023-03-23 19:30:04 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-06 18:04:10 +0000 fdesc_lookup(): drop fdropped (cherry picked from commit 13262b07a06910edd5e58e6bb2e1d4786a7b7d8e) --- 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 e8aa9f81dc2e..85a3c12f3419 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -302,7 +302,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) && @@ -346,7 +345,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. @@ -362,19 +360,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;