From nobody Thu Jan 11 14:32:37 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 4T9nFL1WJnz567hw; Thu, 11 Jan 2024 14:32:38 +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 4T9nFL0MWTz4T77; Thu, 11 Jan 2024 14:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983558; 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=3lY5J1/EZYsPi2aMmVrvuGU0fxUJcFA4X9T+hdvlU2I=; b=pYqrfBzt4dwsHlNVCSZ9pTe6S2pqqDQ2A3Z8sGbWequ0Lgf7Z6CklnK+tNsJFUNwy3nL8w tU7hwpznEENE2EOAMNNsST4voiwX8WQi4fwBHi1X2IgDrwcxFI+AC0wQLo7JW06T8TnCO4 GaUwSdjxH5kTWeB2R+jIRHFj6ZsE2Kgy5zYuD6rMQxLFV2hLJCRp5IVDLvvN/DvdMUKRmX xYYffaowdw88cZjcjSMuxh/oUDXb8Cy7S3GLbRMfjjcEyhyiBGkpWeV0EsWy+H2QMgpdIH 4bGpFM7CI8Bj1KA4xvRVwRz7uEOr25yTWI7rgsCZlzrDVFtOC4CIxjMYf9h/Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983558; 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=3lY5J1/EZYsPi2aMmVrvuGU0fxUJcFA4X9T+hdvlU2I=; b=G0cy4Tacl7dsqiVhvg9bTl7fVz0awQX4PUklLVEYYJYLSDvENopWf+o0cyg/RAKzrxWLg/ WtImqOdRSyPWN1MCeMmDaFU+Djh0hs2TZ1zb2aqhn2xeKaMGRM9uwInGE74C51aZGZkxnq AIcyHidgpKmur7sZ2jzLLDjMQLXXpTssXf7ogxmQUUNKbDkD4BOlQwCFMRO+2YxBkpvDEj R9mMGoLsocxiCGeslpGSWyPYybETCeSGqGFbXQ5eGZvmzJY94/Qnfvqi05KqbXaxgRTbUd KlUpXjkxjfLIeeFE59DsTHUwkG99nCg5f2dY/LBwuxYS5ddChRcmYivhEZ7Y+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983558; a=rsa-sha256; cv=none; b=rJrYyqQyfz0g+QkjrMDANu5KgJ/RiIqDtKUW3kMHsMDgNLqDnwDlgae0MtYzOpoosOCbBQ 0vOK3HfrlA8noS4UIR4It42l9dI+8nWEfPWe6I6rIcTve6SGy6aXkDL8uetd7BQQNGbZgE B1dPgL7EJVJtVPLNJ5sHQvs1ZQQuCn9PGI1FokZeHA6oM4L48vO9rLE/8lj0Mt5aAl7p7k OVGrTK3LyBCy36Ft/QcHcPxGD8OODl1Dn5oKcHsYjav+PHZ9UoJGV7uudKhqYO76+KAto7 SdGgjenxITnK7SC2gG2mtoG42uQcOcIuK/j+qIqwwgIdk3SPzMEWptZ3Xcef+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 4T9nFK6SpwzMrJ; Thu, 11 Jan 2024 14:32:37 +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 40BEWbil024317; Thu, 11 Jan 2024 14:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEWbAg024314; Thu, 11 Jan 2024 14:32:37 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:32:37 GMT Message-Id: <202401111432.40BEWbAg024314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c2b07a75af21 - stable/14 - file: Remove the fd parameter to fgetvp_lookup() and fgetvp_lookup_smr() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c2b07a75af217f11a96de83c31649e4cf567a9d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b07a75af217f11a96de83c31649e4cf567a9d9 commit c2b07a75af217f11a96de83c31649e4cf567a9d9 Author: Mark Johnston AuthorDate: 2024-01-04 13:11:54 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:19:46 +0000 file: Remove the fd parameter to fgetvp_lookup() and fgetvp_lookup_smr() The fd is always obtained from nameidata, so just fetch it from there instead. No functional change intended. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43257 (cherry picked from commit 55edc40e0c7543c6ea08a28d828bcbf0c8b5dad9) --- sys/kern/kern_descrip.c | 10 +++++++--- sys/kern/vfs_cache.c | 2 +- sys/kern/vfs_lookup.c | 2 +- sys/sys/file.h | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 6ed824e229d6..fe6928e421db 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2964,7 +2964,7 @@ fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, #ifdef CAPABILITIES int -fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsearch) +fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, bool *fsearch) { const struct filedescent *fde; const struct fdescenttbl *fdt; @@ -2974,9 +2974,11 @@ fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsear const cap_rights_t *haverights; cap_rights_t rights; seqc_t seq; + int fd; VFS_SMR_ASSERT_ENTERED(); + fd = ndp->ni_dirfd; rights = *ndp->ni_rightsneeded; cap_rights_set_one(&rights, CAP_LOOKUP); @@ -3030,15 +3032,17 @@ fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsear } #else int -fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsearch) +fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, bool *fsearch) { const struct fdescenttbl *fdt; struct filedesc *fdp; struct file *fp; struct vnode *vp; + int fd; VFS_SMR_ASSERT_ENTERED(); + fd = ndp->ni_dirfd; fdp = curproc->p_fd; fdt = fdp->fd_files; if (__predict_false((u_int)fd >= fdt->fdt_nfiles)) @@ -3066,7 +3070,7 @@ fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsear #endif int -fgetvp_lookup(int fd, struct nameidata *ndp, struct vnode **vpp) +fgetvp_lookup(struct nameidata *ndp, struct vnode **vpp) { struct thread *td; struct file *fp; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 8917666950c1..e3ab80f94482 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4422,7 +4422,7 @@ cache_fplookup_dirfd(struct cache_fpl *fpl, struct vnode **vpp) ndp = fpl->ndp; cnp = fpl->cnp; - error = fgetvp_lookup_smr(ndp->ni_dirfd, ndp, vpp, &fsearch); + error = fgetvp_lookup_smr(ndp, vpp, &fsearch); if (__predict_false(error != 0)) { return (cache_fpl_aborted(fpl)); } diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 922adda33b94..6c83746eaf8b 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -360,7 +360,7 @@ namei_setup(struct nameidata *ndp, struct vnode **dpp, struct pwd **pwdp) if (cnp->cn_flags & AUDITVNODE2) AUDIT_ARG_ATFD2(ndp->ni_dirfd); - error = fgetvp_lookup(ndp->ni_dirfd, ndp, dpp); + error = fgetvp_lookup(ndp, dpp); } if (error == 0 && (*dpp)->v_type != VDIR && (cnp->cn_pnbuf[0] != '\0' || diff --git a/sys/sys/file.h b/sys/sys/file.h index 214e8a31c969..dcc739e2e9de 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -291,8 +291,8 @@ int fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp); int fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsearch); -int fgetvp_lookup(int fd, struct nameidata *ndp, struct vnode **vpp); +int fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, bool *fsearch); +int fgetvp_lookup(struct nameidata *ndp, struct vnode **vpp); static __inline __result_use_check bool fhold(struct file *fp)