From nobody Tue Feb 24 16:01:30 2026 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 4fL2XC1hFTz6SPDv for ; Tue, 24 Feb 2026 16:01:31 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL2XC00Gsz3lMv for ; Tue, 24 Feb 2026 16:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771948891; 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=Aq3FmYWcJDAHeL3IoPA1I5p+3MlbLT8pw9rXuET3IXE=; b=qy2ucQqcY0uNYnmf5bKMTU4RFD4M4bNtI4yI2kS0rLiye4jV24NaQCCJeit30LPD3TAKGz mR0KeuUu9qm3gw7RpcKWfny8+DEG/0iL+I6EAsdB7RsdPRQO3dLCkTQ5+KjKO3D2tiofUT HAx9JN24GAQqaOj9ZHzLymh2ADRUmu1vhHRvMgjIO9u8d7qRIJhov6Ha6reROlIdE+Oi2p +t3BBX/P/sRgHgnU+it0024Kurv/a6WMXajerByXKhqwOQ2jKURi6P3k/xzZvUf7Zs1hmk l6pPmKjWe3D6SeAfhdipf6ulCKN3tAZZtGqaDfb54wu7gYG692hhwHv09G2tZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771948891; a=rsa-sha256; cv=none; b=ZOeaYilZDl9+oA2uwmYBt8miB4SCIVxXZaXkPynciT/ACs765f1BNNJO3zfKjyqPWY2r0t sBFz15roEqNQS5Ncy1d20/LKt8DHy5lUqlyD67/5g/zxF9wjQxLmdY+yA3YjuTUzVVDQDK vlMN1oJOchd3Y5FM+KwvRY9K+sB0rTZgQx33bQak4OrpmZhQCivTIf0bi7+Ll9QGI6RXsu ++I+YrN9KG35bWBBY5ZE1bWbxT1MO9rxDbOcoQ3XTHt+hy/88FfRCJrVJSAMFyc82zRUas wQh08369WgT5p+mjCqFXiVo7MDv73XZWHmdR6wwH93dF3/N8tKz7bKhJnrCSGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771948891; 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=Aq3FmYWcJDAHeL3IoPA1I5p+3MlbLT8pw9rXuET3IXE=; b=AQ+gfCUJOKL56/XwvPkUQSBKjnLE+rXKBlt8NLgAu5n4ZhRxkaSi0jufDZejk4jdf7QnFx uQa7pYE/7OclBwkLEqBDULwotPo0mh5svFYvDxXFJIFW3xdiso92776wPHY/cuHHzA81R/ QPdg5YyTMr5XJvU+w+upWW4Hjcr/SbTuRodCMTf90+T/U6/PphNa3HWkZXXcorrD2pDV7z VdqizwuHRg4oUh+NZpzJFqyXrdL2HU/DWfvG8HWcHdMAgLjgccIvXFQOkDr1R2ah04qBYI 0updkWJaVzC6sZgP06pzDm01tBXVhTgsIImQMTVvByiboJL+4+la+hjUCN/aHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL2XB6g2lz75H for ; Tue, 24 Feb 2026 16:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 16:01:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c52fe2c45e4a - releng/14.3 - file: Fix the !CAPABILITIES build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: c52fe2c45e4ae6573eea806fb5ca8d6af69dc0ee Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 16:01:30 +0000 Message-Id: <699dcb5a.27e98.5b8d9e91@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c52fe2c45e4ae6573eea806fb5ca8d6af69dc0ee commit c52fe2c45e4ae6573eea806fb5ca8d6af69dc0ee Author: Mark Johnston AuthorDate: 2025-06-29 16:56:59 +0000 Commit: Mark Johnston CommitDate: 2026-02-23 16:00:13 +0000 file: Fix the !CAPABILITIES build Approved by: so Reported by: Ian FREISLICH 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);