From nobody Sun Sep 13 03:19:33 2026 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 4hjD6G1K1Fz6rWxc for ; Sun, 13 Sep 2026 03:19:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hjD6G0Zj1z4J97 for ; Sun, 13 Sep 2026 03:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789269574; 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=n7WIYDlwpS0H4Ote1ZWTMTLcUE0rdXMZ4Low18v4d5o=; b=WTCk9A9pHfMZacEdNmr5Je+/BozInRPJ4lxgu8tvNKo1EMB2gLGauTNSfEXkTXY4JoQcZN jaEWi4JJHSpSVYeEtY/lDdHE4appZK7+0vEU7cdP3fQSeZ6RzqJZrkm1D2aRQrzb/bzULu VdfQdcVjYyexFVsWAYhJGr/ejvgODcXW+f+Xez1GmK6yUxP9Y211EOXCKID0yFnjcH5Jzq o6F7TVFTiqT+RZzKlgbPW4k2OMomq6DtyY4zJmhX+RqVFGmSe+8bIL+ophfTZImoNl/aml ZepKSxtwDwtgrPQif80YKZLcjWqmp1kQf5ZzpHhHiTh9ObT53r2SIBtrjfLIxw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789269574; b=dQz2Y8E3d8E9hCwrVmlXDG6kTkyOzp9XDdQIDjiGZYEEYkEuU0kdZp0KnjDDFo0SMzxKt6 abREgCmo8iOEbxNatrF03r91fforIe2enJKlxU/A3jgfz+GBMH1I7L+xPNIgUsSQtaWDLv A8HtQxs+StuhMQIDqxhLHo3mZ5gQb01mgtUhv23zdoeocociRxZgWOa5+EW9x7Tq5UiPvk 8kl8vLFHiMVsVbddqImitlHFfmsTKcuQfReUTgHtDuwKMmTuZHxtQTJMEFYqmD5DhKrR7m KhSfkDjjrCjhPuFJY/xk+fwsUorSiMQR0znjO06jcrWicfb3AI6Trobnh1D7sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789269574; 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=n7WIYDlwpS0H4Ote1ZWTMTLcUE0rdXMZ4Low18v4d5o=; b=F4DuTyM4bcJMoz/VhPNr+sRT2Y3jLZW9jofn4n0cxFfCdmtPicrzsoqKgIAlC+JgLLF0DP ulJlQphch1JpQuJx1W2cfNTgduqdOi+7sjq1auoHQaVPNMJ9jIg26xutWr8oFLJGAliQtN UYHoiY2n2TmrDIBELtehw6HWKuK1G9qqVvMirAOBMrG74mh5sz8QENCNI/t8NC0EpRFvwo thBwd4g7wrBhosil0Clr0RrtGq27pu4yvPVoRPoOzUc/VLG700dYiQO7aRsUCCh8ETJh8j cYUVCtghWo1u3OG7yrXkl3pbmDXRE0uqA8C6Q+wBWqpwwk/Xn/neQ6+hvC36JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hjD6F6m1HzPsN for ; Sun, 13 Sep 2026 03:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 334b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 13 Sep 2026 03:19:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jason A. Harmening Subject: git: f57ce26f2572 - main - vfs_lookup_cross_mount(): fix missing LK_CANRECURSE 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f57ce26f2572efb8adc825ad4efc0e0743a9112f Auto-Submitted: auto-generated Date: Sun, 13 Sep 2026 03:19:33 +0000 Message-Id: <6aa61645.334b4.7e3acd38@gitrepo.freebsd.org> The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=f57ce26f2572efb8adc825ad4efc0e0743a9112f commit f57ce26f2572efb8adc825ad4efc0e0743a9112f Author: Jason A. Harmening AuthorDate: 2026-09-07 17:36:20 +0000 Commit: Jason A. Harmening CommitDate: 2026-09-13 03:19:03 +0000 vfs_lookup_cross_mount(): fix missing LK_CANRECURSE This was a rather dumb miss on my part in commit 42442d7a6e. LK_CANRECURSE is clearly needed in any case in which the covered vnode is held exclusive across the call to VFS_ROOT(), regardless of whether it was initially held exclusive or upgraded. The commit message for that change also noted that unionfs lookup only worked without LK_CANRECURSE due to a coincidence of the then-current unionfs implementation. As it happens, said coincidence was recently removed in commit b952606b4f ("unionfs_lock(): eliminate LK_CANRECURSE special- case"). PR: 298201 Reported by: olivier Fixes: 42442d7a6e "Generalize the VV_CROSSLOCK logic in vfs_lookup" Reviewed by: kib, markj, pho Tested by: pho MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D59494 --- sys/kern/vfs_lookup.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 71d4d3f75721..34e9bb47b532 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -983,16 +983,20 @@ vfs_lookup_cross_mount(struct nameidata *ndp) * We are going to be holding the vnode lock, which * in this case is shared by the root vnode of the * filesystem mounted at mp, across the call to - * VFS_ROOT(). Make the situation clear to the + * VFS_ROOT(). Make the situation clear to that * filesystem by passing LK_CANRECURSE if the - * lock is held exclusive, or by clearinng - * LK_NODDLKTREAT to allow recursion on the shared - * lock in the presence of an exclusive waiter. + * lock is held exclusive, upgrading the lock (and + * passing LK_CANRECURSE) if the lock is held shared + * but mp requires an exclusive lock for lookup, + * or clearing LK_NODDLKTREAT to allow recursion on + * the shared lock in the presence of an exclusive + * waiter. */ if (VOP_ISLOCKED(dp) == LK_EXCLUSIVE) { crosslkflags &= ~LK_SHARED; crosslkflags |= LK_EXCLUSIVE | LK_CANRECURSE; } else if ((crosslkflags & LK_EXCLUSIVE) != 0) { + crosslkflags |= LK_CANRECURSE; error = vn_lock(dp, LK_UPGRADE); if (error != 0) { MPASS(error == ENOENT);