From nobody Sun Jun 29 17:12:46 2025 X-Original-To: dev-commits-src-main@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 4bVbTC1BNmz60S5Q; Sun, 29 Jun 2025 17:12:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bVbTC01lDz3sTQ; Sun, 29 Jun 2025 17:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751217167; 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=uObcQyqHiouiF4gmuXheU1Ax52f8y5APRGLipJ7xYuE=; b=wWaFHl5f0APEZBx+tNwXim9v5kmHT5u7U9zcA1u5UtTEc8teZt4QCAJ0p7p4B8ig8HSfKG GzZBrSGmyI3qmf+MMBdPplkSuECjawus1bbjER58d8Coi6TMZ2jcio7Ih21qGD6gwQSM21 qrHTOb8OSag71lfJhlTPg9rLsctSUUWqDdrzqu1ELTRhrzYrkJc/q/ljfpncQEBlX86jsI D/4BW+j2qXRrBQyluCfLf3EiSQnrKH5zmbj+ugqS3j9MxuQDEXEuM5wrqrCrQWT5wUH/8f d+/xtClgqlo4E1S5l83jZPfnWoJgOZTvuJ6p4qgZET/jWRn3KHYAxnWJd44yLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751217167; 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=uObcQyqHiouiF4gmuXheU1Ax52f8y5APRGLipJ7xYuE=; b=LPArqv3/r+n0GZJ9MxrEkDpEhycKZfjSyvuPR4KWcFMaTj1XzAkKljpgWZq/mgwsl4vER1 L0WopLKSocH2t9JMiHKSubvLFk6bDvit55ZZbhf6XYJfms5KZ5lvwlmL3As5RH33vhpJ52 8KR4XMqLp5sBDolbz+f5oi9YpCCbpDcwaPR3ZuKEQ5isXOCxd40TgBNmOjWP9ItDOIJJwB OQqqzZP2rSRiYNisP3rg1NzTX5nvPU0Qwa+0knuRWjAgYp9ihrBhWD8ZSlxb6AVx8fI3Of UfCRP4zOxRf2daJK1yz+Rx2TB5KfCZCPa9XDkhaWDNVpnPfEgEXRzoL4m3/IgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751217167; a=rsa-sha256; cv=none; b=Z3Z0vOlMkmq+cA8dU5fdRgAoycV6djm6vhbvw5V3D21D7u2uHtOWY3hHvm8fZF25qPfJZ7 f0g8T+jwH9AEbK/jsjhHrXY/FYP/17xuM1O2uAUErGOx3AojL8+UY39tNul2mIK91PHUrL uQrh94CfqwMccJeQJlJmXRSfUqzWg8nDb/p55pCnCw2nOzBs4bSsvfnKohXSXzwptt+GUq 7/p6agVkZx7usvKZV9nUTIuGg+QsE8r9OlJpKzCQ3id5gdAL/hkQ3DC84Bokup8/VruuZr mdmwsPscMJ6BDX9nPFhxOOZL5f6t33z+qYTOJPDJDrAzJduBaTpoB5L5cwoSvA== 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 4bVbTB6V8tzCZw; Sun, 29 Jun 2025 17:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55THCkMh087066; Sun, 29 Jun 2025 17:12:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55THCkRa087063; Sun, 29 Jun 2025 17:12:46 GMT (envelope-from git) Date: Sun, 29 Jun 2025 17:12:46 GMT Message-Id: <202506291712.55THCkRa087063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6783dfb10637 - main - file: Fix the !CAPABILITIES build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6783dfb10637100067520bd6d9804e154cfee7ee Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6783dfb10637100067520bd6d9804e154cfee7ee commit 6783dfb10637100067520bd6d9804e154cfee7ee Author: Mark Johnston AuthorDate: 2025-06-29 16:56:59 +0000 Commit: Mark Johnston CommitDate: 2025-06-29 17:12:35 +0000 file: Fix the !CAPABILITIES build Reported by: Ian FREISLICH Fixes: f35525ff2053 ("file: Add a fd flag with O_RESOLVE_BENEATH semantics") --- 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 bbd6d530f478..ac4b6ac3f457 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2964,7 +2964,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); @@ -3141,7 +3141,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);