From nobody Wed Jan 31 01:02:03 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 4TPkJr1t44z5825w; Wed, 31 Jan 2024 01:02:04 +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 4TPkJr01Ttz4CbL; Wed, 31 Jan 2024 01:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706662924; 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=t6HTUWeklD3Xw9ooZ2SMrVctCBp+e9st2ONYh7OpT10=; b=W65mnMn9KBie+3lDRtBU4UsogmUJnAsTieMyruAgM6N9oNSvm9ro+QFn2GZJ+LJLMloC9L mLKL5KhOWKPg0c5NfwHnxjUopEjAl+DJO/eWMp1xJQ8onBI6woSFEvWcVhHuau2haLpYad 4HvI0ks1aaul6h6nJhxpiICewCc4bx53zdjcJjTrqZJ+jzqeoXIQuqc+keQeUenLtwgYmD IiN66eFzYBiavoidma4HkkVtEdIKVz3TbAi9srW70aj6t32Sba0FyMtvRCaHqVrIWWa0Tp D2mZTBiubjV4F9IqA1rtR8qeQ0UCSf2j2f6EbJ/tuUo4NRnRGhsvUyRx+AiCZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706662924; 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=t6HTUWeklD3Xw9ooZ2SMrVctCBp+e9st2ONYh7OpT10=; b=SJ8oNYpD80TssX+DFQzJXUxUFaEU3S93XRRtwlINXTfI75f7+C0sT8pvTKNXKmNhhKL8bF SXsyL7cZ57oEQ3mKzqtnFTRfKwJHU0pH4j5wufMpRWmh7ZJ6kBNRSazLG87ZxJUafRiFMk NfAhvjHNIAmbpqWGqI5mDtaPye4M1YMz7UNvXlEpbdznWXXaKbUD8Hf4cUBhFD120sTlrX M9lnyGKBlwZfcBE9HlNZKCnjdleBew6hSiXSePCWm7t4Rvw3jOXSjEwYH0CCCgfU663Gqu PqcD5pp+bxkUAeHYtsDEvL/zjK2YKnlFT5F5pNRme8dkBQyXWM+dCYSzvbc6RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706662924; a=rsa-sha256; cv=none; b=xHM2eoCgdOKDqGyFfj8GOu07BA/dkj6U88ueILuFdLt0/ERmsstidFiQJtyWvu/j9I2EK1 AbwEkNXDeZH7HjTBogCE3oyMT1Tm2jqetaGAxGfQ/AOhHo46d//M2sNVG2fHGqPFpzV2W/ /ii6c2v1udUImutjA4bgeN+HNLJB125bFfOnUQ/I2sj6qccXRYIoupuQcERv0txhj1NNsT sd+Jtes1pjFa/T2pD+dI88X/kC7ePxF1FNGo5cl/mMceq67Q/7ZZ8+U9bmjcF6pg1VG5sN IfSsCAMb7TZyr0d3cmWeG258Q64yVZKWTqYvhx+IHPZz2kVYttnw7shxEjjQ/Q== 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 4TPkJq69y7zyKt; Wed, 31 Jan 2024 01:02:03 +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 40V123cY096801; Wed, 31 Jan 2024 01:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V123BT096798; Wed, 31 Jan 2024 01:02:03 GMT (envelope-from git) Date: Wed, 31 Jan 2024 01:02:03 GMT Message-Id: <202401310102.40V123BT096798@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: ebdc39c9e9c7 - stable/13 - kern_openat(): rename fd argument to dirfd 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: ebdc39c9e9c7a9682c28691d3a06f4fff043af3f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ebdc39c9e9c7a9682c28691d3a06f4fff043af3f commit ebdc39c9e9c7a9682c28691d3a06f4fff043af3f Author: Konstantin Belousov AuthorDate: 2024-01-20 21:41:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:33 +0000 kern_openat(): rename fd argument to dirfd (cherry picked from commit 2a284076ecb4d22928b78249070efa46153666ff) --- sys/kern/vfs_syscalls.c | 6 +++--- sys/sys/syscallsubr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 830f0d008aca..3c45610a8853 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1104,8 +1104,8 @@ sys_openat(struct thread *td, struct openat_args *uap) } int -kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, - int flags, int mode) +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 filedesc *fdp; @@ -1152,7 +1152,7 @@ kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, fp->f_flag = flags & FMASK; cmode = ((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT; NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | WANTIOCTLCAPS, - pathseg, path, fd, &rights, td); + pathseg, path, dirfd, &rights, td); td->td_dupfd = -1; /* XXX check for fdopen */ error = vn_open_cred(&nd, &flags, cmode, VN_OPEN_WANTIOCTLCAPS, td->td_ucred, fp); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index aabcb19448cc..02e5b1a4c077 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -228,7 +228,7 @@ int kern_nanosleep(struct thread *td, struct timespec *rqt, int kern_ntp_adjtime(struct thread *td, struct timex *ntv, int *retvalp); int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap, long *ploff); -int kern_openat(struct thread *td, int fd, const char *path, +int kern_openat(struct thread *td, int dirfd, const char *path, enum uio_seg pathseg, int flags, int mode); int kern_pathconf(struct thread *td, const char *path, enum uio_seg pathseg, int name, u_long flags, long *valuep);