From nobody Wed Jan 24 05:13:35 2024 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 4TKXDH5SqCz57SxH; Wed, 24 Jan 2024 05:13:35 +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 4TKXDH4Wswz4dwJ; Wed, 24 Jan 2024 05:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073215; 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=fJvULpIFiaWipNHFRJQv6lBSxtQtc3vseaavSRzFqtw=; b=JrCVtX4z3AfHqK++/N6R7gX+Phtj7u3ID79dfGX9HNA1zojR+XWwLjZ6UlWljS8BddhNSf i379Sy+XCqTdMuSKxT3Db1DzglAscOF8fTs6zxiOLBcQoitLbnIQXmoozAXVRgKllMch6g 1UEuS3+L8FaOdsVg7ct5WT0M4WJDiSyDjWTGf9Z1Q9wdXSikl96lePK0AHWCi3y7LGfi7F QBuW+tTGkv1W0sMd0xZub3gENBI7OLYPhcJV/INl1H6aeJhkwgqcV/5I2EjTeZsGzsSKU7 qEm3qe2Wfu4j9BOq09hchadtjVyZIGBQ0UY0gy6bwHK3xmk6VRy1zS2P6/v6kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073215; 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=fJvULpIFiaWipNHFRJQv6lBSxtQtc3vseaavSRzFqtw=; b=FqL9dhynll4O4z9UfR/A2nghmSeP3ZncpkbBq1MxqL4uZDv9YzZe1y3JXPZFOcrKkoeZg9 cAXyQz/asfJlM0b3A7H9ToscYeSJiCaoMuP8W9BXTyuD0ABDEi7OhXQvCqmfCjoZDrhf8S yzpEgxifnPaXvELA/nBLGDgo9oZkJFh0qEGT+4S6oso6JNOEgi1bz4xz+puW6zAZBQ2zFJ 1VibHTPTEzco0HdhSHcAKSTHzNIAJgFzSsKj1YnOZAjVavCE/l5HUJzRSB7nKp7G2A7WkO zCLKGNlt7TRCReikcK+eUM7BJ5Mrv1KhQigdyyU/XkswPZI/Rk+dC8XUbffOVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073215; a=rsa-sha256; cv=none; b=U3sCzA/cpRdrU1SE+UuFMnfpQZjrwYl5QUNZqO7Z8pDImkTw2AiAwYEsNeL5Mrh88BCLoy 73AX/31NBlNVAcARQkLQgPKxC17KoecHITnsj/oQyAZf0gRByzxfqQ6dM9AGbuEWnGqdhi R+cNP5Xvarei87Wv4fQ9C9mht/9rumcfb807yKjqkxHBVdgobnW79pRpqhXtwtJdxm54dD ZOkV0n9NlhZ+hsV1EdYO2Lc5Yp5ucAvKjIj2n7LnnBOFxno2g2Iww1QSdCqo7n1kwiUC1X Lx/rbinkyRZqOeBREpgO5/vytTyMXu5gLO+9tJc0ps9JRpyicb9md7RUU3gzdQ== 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 4TKXDH3cwlz11W3; Wed, 24 Jan 2024 05:13:35 +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 40O5DZkn041763; Wed, 24 Jan 2024 05:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5DZsk041760; Wed, 24 Jan 2024 05:13:35 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:13:35 GMT Message-Id: <202401240513.40O5DZsk041760@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: 3d59b93b207e - main - kern_openat(): minor style fixes 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: 3d59b93b207e5008ea0b79b38268243abf225546 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d59b93b207e5008ea0b79b38268243abf225546 commit 3d59b93b207e5008ea0b79b38268243abf225546 Author: Konstantin Belousov AuthorDate: 2024-01-20 21:42:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:13:25 +0000 kern_openat(): minor style fixes Reviewed by: markj, pjd Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43529 --- 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 cccb24257e11..5d065e638203 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1114,16 +1114,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; @@ -1229,8 +1231,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;