Date: Tue, 24 Feb 2026 16:01:30 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c52fe2c45e4a - releng/14.3 - file: Fix the !CAPABILITIES build Message-ID: <699dcb5a.27e98.5b8d9e91@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c52fe2c45e4ae6573eea806fb5ca8d6af69dc0ee commit c52fe2c45e4ae6573eea806fb5ca8d6af69dc0ee Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2025-06-29 16:56:59 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-02-23 16:00:13 +0000 file: Fix the !CAPABILITIES build Approved by: so Reported by: Ian FREISLICH <ianfreislich@gmail.com> Fixes: f35525ff2053 ("file: Add a fd flag with O_RESOLVE_BENEATH semantics") (cherry picked from commit 6783dfb10637100067520bd6d9804e154cfee7ee) (cherry picked from commit 8f6769b82a2a071cf07080b6d77639e919efbbcf) --- sys/kern/kern_descrip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 1932336ded28..32b07192fcbc 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2968,7 +2968,7 @@ fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, uint8_t *flagsp, struct file **fpp, struct filecaps *havecapsp) { int error; - error = fget_unlocked(td, fd, needrightsp, flagsp, fpp); + error = fget_unlocked_flags(td, fd, needrightsp, flagsp, fpp); if (havecapsp != NULL && error == 0) filecaps_fill(havecapsp); @@ -3145,7 +3145,6 @@ fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, int *flagsp) flags = fp->f_flag & FSEARCH; flags |= (fde->fde_flags & UF_RESOLVE_BENEATH) != 0 ? O_RESOLVE_BENEATH : 0; - *fsearch = ((fp->f_flag & FSEARCH) != 0); vp = fp->f_vnode; if (__predict_false(vp == NULL || vp->v_type != VDIR)) { return (EAGAIN);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?699dcb5a.27e98.5b8d9e91>