From nobody Wed Jan 31 00:46:01 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 4TPjyK6GFNz580Rx; Wed, 31 Jan 2024 00:46:01 +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 4TPjyK5m20z45Wr; Wed, 31 Jan 2024 00:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661961; 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=q0ghJ7TBF/uPTcmNTK1YgIZrzm3TY3UasiwDKtkKpM4=; b=yQJdbua3Z4R4ky2oBEFwkb7OErepUYxtnNYIBnWZTriVBVrwJ7kCvWe37w4H4bfbOZJ2Cd IkYI7WbcAK8GQfNBnkqc2DOYvoFbNLeWR59RqkzW8kNGL9ulN81Hspat27NyI61++hq4Vy mL+V/4Hx7ulllpOqHjFCupdHJ2hdBLqludPUKWdD/rLynCWr5AawCT2/mIQ0BYyD1DvwFP ycOVnEqNMIgSqScOHio1YA8qan2Glny+lDlv3tIGcayeWUc2pbim6WjmEhQUkHYWo8Ntui cr+QNkI/GlLInVZPrz/+8nTcfqAFT1Ytz9fy0DdUsTfDnOK1GvxLni0yz+l/Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661961; 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=q0ghJ7TBF/uPTcmNTK1YgIZrzm3TY3UasiwDKtkKpM4=; b=eBL52s3DkX2PFe450Nv2FVsRW/Xjm4DgHno9pbQgFZZk0aIjmkxPoSc2P8DnmDRwOpEHVE DU3MxF/XDdIiT/Cxs5oAs1t2dkJ0Tn+EM4vcuIBpzHpva6Is1oLA2UY24A1RT4MW4vPtRI iHL4ihO8aiIoncRqdflLUPlEBWQW+fDTCNLhm4MBXpibCkOHMrJX4FqjJXv4cQLUiCLudV 5iCzqFOSj1mCGOK/QYZvaviTTbQqTzVgOrQigec2J7s4+QS8bVbbHv6zW+74gvpRB96Nsl Fr4jr8e+qyNSK1QjRfrZgLn3UQ0aajtHywtAyy26UPPQRgq+lH40PV6yyAbY8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661961; a=rsa-sha256; cv=none; b=v45v3iCUC0h0YP0SufJ12VYnXT5b8LUtKxWQr34jkahL49T8GXBqQEg29NGwkNJY/cP1vt nrP3hQo8QyHXKnSDBPsajoa9LgTxE2lpi2SqNUdI3Zmz0hn8vdLJJM8EjBlhtEwtHTfbLY mRqmkPL+eNjnUXUBmvLMvFv8vYz3JAiJdyXuTcr0JFbPlAjuvMY+lDuWB9TayYmqEVJTeR wvZ+qm8GnIZyNEcGrPr7Xg/MIS/BytY2Tc87FDByDPfaIrZLPFLG0ZsxbYp/0P0//j/ScN 3tg2MhkNtE+OLCiHlIQ3ga7lEn20sVL0b7A46IYj6UPVhbtgmFGwVmw9mO4U7g== 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 4TPjyK4rl2zxmc; Wed, 31 Jan 2024 00:46:01 +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 40V0k1xd063182; Wed, 31 Jan 2024 00:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0k114063179; Wed, 31 Jan 2024 00:46:01 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:46:01 GMT Message-Id: <202401310046.40V0k114063179@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: 6a5396c1c682 - stable/14 - kern_openat(): rename fd argument to dirfd 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/14 X-Git-Reftype: branch X-Git-Commit: 6a5396c1c682b71e6dc5e8e959860f78ad9aa550 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5396c1c682b71e6dc5e8e959860f78ad9aa550 commit 6a5396c1c682b71e6dc5e8e959860f78ad9aa550 Author: Konstantin Belousov AuthorDate: 2024-01-20 21:41:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:41 +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 d735a8a4929b..2fac2bd46a15 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1113,8 +1113,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; @@ -1161,7 +1161,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); + pathseg, path, dirfd, &rights); 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 0480eda2fca4..294ff6ef00b9 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -251,7 +251,7 @@ int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap, long *ploff); int kern_ommap(struct thread *td, uintptr_t hint, int len, int oprot, int oflags, int fd, long pos); -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);