From nobody Sat Aug 22 01:32:32 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 4hRfmx1hwJz6pvbt for ; Sat, 22 Aug 2026 01:32:33 +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 4hRfmx0yqNz3XT5 for ; Sat, 22 Aug 2026 01:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787362353; 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=8MGlWgFo/v/wQwpE5NIdpSwlSsp1ZUI4F+hxxob8eXo=; b=uL51XcrOn199slk1p93/e+gcz+2gY291KnNEgMpeXK3I1L1dqMfBtCtIZFYXUPWP4oZfVp AOi9tZqrwY/gKNIqL6JB+NYFlkdENw5JaLx9V9zn6UHUzHsUnIJxCUYJhSOBfJdYWTAOSp ZA9NNg5jxLIxLe4QIe8+Ht8jCmLCI8b5Y1FQGxBolPlYQF1YXlPBGYcS+ovEqhpp54IsnY vJF/HD4vxBCZm/CLSrRzUJN3Rv7GUogURBKKycVwF/7kD1O6ukwPsVWPBJdOF4CvRpCtn2 4PXrNnjBIqZUcueWA5UEu7j5j/jb7rt1BQSmdQcWngM0f34cFJR1PWQ/RM2i9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787362353; a=rsa-sha256; cv=none; b=jYf9qAaDb719k/IVpkMka0QquLY9s7jo2LGTxTwL2cHVAZXcJfLqYJ6naqm21eDupwpvT8 SIqz/Qe8WA66DkuRewQ4NMloyVwGkmJxmvhLX9BiAqvzuDBUjcRCAMEl1jxv4FWlnOiNzq kGCawlW74i8oc+LnGEQ2/6MD9wNuPudqK3g+b6ylsUR9a6DuqI1/j+zc4rweV6ALyyVxQt BkqkZJkaIa07pU4evl9X17LxBZWC0spsV8BCcIMCNf8sJAJdQ1Noj9QLo67AQnmi/RsdA4 hTSe3PIdslpvYo+fZvYTFe36i4QI2dUTVb5m2Aw/a4K07ZANxy1kP1Jd8Ujfew== 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=1787362353; 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=8MGlWgFo/v/wQwpE5NIdpSwlSsp1ZUI4F+hxxob8eXo=; b=rUiIv6H745DtGDJkaJiJKvffecfSJHM2oxi/AUXGWcIiDH3dO0kiqbhQNY3dQMfTD1ojAF lNXdBJXM29rEuaiSv/PruFFUYfJb4M9nIyAz+amm1aPW8lG4HkVbyO3dO3aVA3AjIxSilJ +rMNBQ1+4Tp0xoibCu7UeunR21+DQXuXzzTZNU1/+VaC/l8gKcPA2cuPw3InjluuUDbR0D NDBYrEkFCP9c9u5w2HbentJhjQQqN8U2emc1okS8y+3Lk4xd66nVHDmDSWPWCoYUDq+goA q3gSs0Z78NqsBfMPu8yhviJkxTG+dp9E1LA9Ots89Xs3/rUqilLxBxphimw1VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hRfmw72xdzCyk for ; Sat, 22 Aug 2026 01:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3320f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Aug 2026 01:32:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jason A. Harmening Subject: git: b952606b4f99 - main - unionfs_lock(): eliminate LK_CANRECURSE special-case 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: b952606b4f999d2e691a1adf02f0ef0b2b34d26c Auto-Submitted: auto-generated Date: Sat, 22 Aug 2026 01:32:32 +0000 Message-Id: <6a88fc30.3320f.2112fbc5@gitrepo.freebsd.org> The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=b952606b4f999d2e691a1adf02f0ef0b2b34d26c commit b952606b4f999d2e691a1adf02f0ef0b2b34d26c Author: Jason A. Harmening AuthorDate: 2026-08-15 16:05:46 +0000 Commit: Jason A. Harmening CommitDate: 2026-08-22 01:32:15 +0000 unionfs_lock(): eliminate LK_CANRECURSE special-case As of commit 9f5c4ef328 ("dounmount(9): temporarily enable recursion for the covered vnode lock"), the unmount path handles recursion automatically, so there's no longer a need to handle this case in unionfs-specific code. Reviewed by: kib, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D58858 --- sys/fs/unionfs/union_vnops.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index cfa0f4ab768e..998ca5ea7889 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -2252,17 +2252,6 @@ unionfs_lock_restart: lvp_locked = true; } - /* - * During unmount, the root vnode lock may be taken recursively, - * because it may share the same v_vnlock field as the vnode covered by - * the unionfs mount. The covered vnode is locked across VFS_UNMOUNT(), - * and the same lock may be taken recursively here during vflush() - * issued by unionfs_unmount(). - */ - if ((flags & LK_TYPE_MASK) == LK_EXCLUSIVE && - (vp->v_vflag & VV_ROOT) != 0) - flags |= LK_CANRECURSE; - vholdnz(tvp); VI_UNLOCK(vp); error = VOP_LOCK(tvp, flags);