From nobody Wed Jan 31 00:46:02 2024 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 4TPjyM0m52z580cw; Wed, 31 Jan 2024 00:46:03 +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 4TPjyL71B7z45Tj; Wed, 31 Jan 2024 00:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661963; 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=eVeAdDy5F1h9OVk6p0tMDCgm5KWANnY/hi/v9nkbWWc=; b=s+gV4motRgt2jZt3qiAk3TcVjh6i0xh2OluBVxlk3GRsW6AdHuLJzKCyuiEWtgnNS2VYkn UmoI7NqULtPN5Lh3q+BfZAl0I8xZdzDgqszANmpcvMoK/g+RN/93GLT1Gzb5HJWP1l2Fku 1PEm1fR9YJM4MXg1iz1CURwSHs10sIZxGJqXvOkDrZosIyyXysrVx9e4U3QBf3UGdD4xS0 ETjPrlxpX4wegitcGUIGWWKTUFFIFiMRz7S72SKgjkkeQ7OOPD1CSlApfKfveic2iq9JL2 DO8YuFsjdPm21Qq9wjgVv/Rkb82DNF1u4hB+gO8ySnlwDIymLam9aKXYxr+FlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661963; 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=eVeAdDy5F1h9OVk6p0tMDCgm5KWANnY/hi/v9nkbWWc=; b=a8qrpxaWfKoRC6XfpnED0X8vAS0exG4SqnL79RHznqv35qrwsy4dm7/dSx9Jn9X7lW3Owc NBRo6TEz5s0zOLY9HM7rOSYpaW7hLAuBJ1RH4gAfjOFT9s9F06I629wyZM8rLUYrxLgUs3 4bMrlZ0VQOhZF8CWwSshkFvSn/mOscH+Z70z7491rkKAh6UJJA/X3uYH4+qHI3GRdbVsYW cp4reh1A4oKVganCkfLiV5Wqdo8npz+8qWH9Bnsf3ZBBdmLef0BByI19FcPoFnxL1zXmjT LtEq8eIqNlUd8oYsxlCMrkUis+c0FF7BiIMvTaDGAd/9yWfBDMViwBKQQwRVUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661963; a=rsa-sha256; cv=none; b=pT7Cs8To2Gvr+VsCCpZqO5vvHohiDSAvebYZQAWSkVdZ9pSDJM3drTF61dUtIsXpkEl66R o+gPnkuvhevpuidlzvfnKbduihW+D4AQ0oHUgGuXw0HTnb+yFqm2qqCOZGDS5O3e18iEnh YLSX0sd8G6hSH4LKEyjp8HMcqb9+L2RP7q/1Nb9NvLXJL3O5zTkBX6np9/XBS6vix/RSxv 8unPbIZPPfl5y5QZvbatbw0bsji+RIBtFvq16movK85mnJQ12MGRMciySB4BhBQK/p+U8e yTT9Da3yWKnm5U8PiAkVzLfWTtWIhsJQwVtw1W3nVH/treRxyXgyp2ix4rn0rQ== 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 4TPjyL646ZzxxD; Wed, 31 Jan 2024 00:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40V0k2CV063221; Wed, 31 Jan 2024 00:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0k2Ys063219; Wed, 31 Jan 2024 00:46:02 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:46:02 GMT Message-Id: <202401310046.40V0k2Ys063219@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: c728101ff44c - stable/14 - kern_openat(): minor style fixes 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/14 X-Git-Reftype: branch X-Git-Commit: c728101ff44c95a83c7e9a2c6c370eaac06e105d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c728101ff44c95a83c7e9a2c6c370eaac06e105d commit c728101ff44c95a83c7e9a2c6c370eaac06e105d Author: Konstantin Belousov AuthorDate: 2024-01-20 21:42:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:42 +0000 kern_openat(): minor style fixes (cherry picked from commit 3d59b93b207e5008ea0b79b38268243abf225546) --- sys/kern/vfs_syscalls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 2fac2bd46a15..41bf2ff1d3c7 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1116,16 +1116,18 @@ int kern_openat(struct thread *td, int dirfd, const char *path, enum uio_seg pathseg, int flags, int mode) { - struct proc *p = td->td_proc; + struct proc *p; struct filedesc *fdp; struct pwddesc *pdp; struct file *fp; struct vnode *vp; + struct filecaps *fcaps; struct nameidata nd; cap_rights_t rights; int cmode, error, indx; indx = -1; + p = td->td_proc; fdp = p->p_fd; pdp = p->p_pd; @@ -1231,8 +1233,6 @@ success: * If we haven't already installed the FD (for dupfdopen), do so now. */ if (indx == -1) { - struct filecaps *fcaps; - #ifdef CAPABILITIES if ((nd.ni_resflags & NIRES_STRICTREL) != 0) fcaps = &nd.ni_filecaps;