From nobody Wed Jan 31 01:02:04 2024 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 4TPkJs2bYtz582Tq; Wed, 31 Jan 2024 01:02:05 +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 4TPkJs0w0Mz4ChB; Wed, 31 Jan 2024 01:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706662925; 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=mkU09zrNbpgwImCggiweT+CZ4BbKqd/xgosrsyjc9BA=; b=bVSiCTvkAs+sxYgM5ihoEPJ0YmNYICmfGIiDF/og/3OOxyfYS3K1CwRn9NsWkpw3nVKykB ujLD22alwnuT5zXevC+TttZRbQAfiSdOhg736vBjxKhOUZdH8z2xli7nYK8TVnPoeuV6D+ sAfP7ShlHqhWzc9f7W5AY0apAYf6r4r2xqTKGFbqf1nz6ox4FHbVzkc/b22zl7GEqd5CSM JfWjOWrY68Z/xXUDEb31s7iwISkAucIT1ucDVdrkGEU+HKWN/uzB2boUr4tceiSrsn/pUn E3xXJyiVBvGTnYL3+SalMsZURAebr4v40IpQqrKJcF5Yy4bFGIrSwTmX9ZjJ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706662925; 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=mkU09zrNbpgwImCggiweT+CZ4BbKqd/xgosrsyjc9BA=; b=KgjBlUJvSZ8RAS6jogUoFtsOVmaWcoRJNWjyH5/rI1uxpp4exrAZNtc2By5FEj0ruiXnYA 9YBEL6bS677lJu2WWsO6qXzEqW6Smyp/sRaZIgD1bh3S2fi0KHZ/hvtJJL9odMepRCOF4Q pHnga9cUG81h27pEKB6kaQyIuZk1v5J5vkmUkhfmMmdszds3wMF6PvoTo5A4rCviPLLZ3o JrlHr7Mxaca1uqXGS4pibP7XGVnQemnpunNAv0MhOK+iGGpeZJBhZ4Qym1nzZe9U+Eol2U EDaCGrVnc45gtqwJT3o5wWvbAbBCHz/5sDuMdr7fhSNFwNV8NHDtvOuzgKehCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706662925; a=rsa-sha256; cv=none; b=tz4/t0NWlUHx70LucEgc12iVTws3e+UfXjRdp83Rbmy1l2mR/v6C0Cpz8qrVzF94Dr376A SOxDc1CBfB+VUAEA0jn7jbGf1HmdvD9IZmEBAGqn/BedN9M2BA+z2EVj2fBtIITOKLOMkG eE2YXSvdsR4+Obxt7LAE9o1Lse9LXiv0I2QGI3K6Nx9KbR6r7VKpQXoRRj2XzjcirsaFMv sT1npZAm9Y0Y2L6OSW0pLHq2sgqrX9GNkP/6plV5Ksa8Q+U51tSTZexMlUwem2fp5g7r7e mjNP/lLwhuxArOiauitHeqN3NRKccIpv1sPCeQ5ZSB7URPGaH4iw1tXN9K5MIA== 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 4TPkJr75F0zy6f; Wed, 31 Jan 2024 01:02:04 +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 40V124il096840; Wed, 31 Jan 2024 01:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V124se096837; Wed, 31 Jan 2024 01:02:04 GMT (envelope-from git) Date: Wed, 31 Jan 2024 01:02:04 GMT Message-Id: <202401310102.40V124se096837@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: a93ef23ecac0 - stable/13 - kern_openat(): minor style fixes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a93ef23ecac0aaea2044029aa9b5b0d28c17a65c Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a93ef23ecac0aaea2044029aa9b5b0d28c17a65c commit a93ef23ecac0aaea2044029aa9b5b0d28c17a65c Author: Konstantin Belousov AuthorDate: 2024-01-20 21:42:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:33 +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 3c45610a8853..494bae687406 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1107,16 +1107,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; @@ -1222,8 +1224,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;