From nobody Thu May 28 07:57:37 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 4gQzNy1FTcz6fJ36 for ; Thu, 28 May 2026 07:57:38 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQzNx6Wv6z3lC6 for ; Thu, 28 May 2026 07:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779955057; 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=PAgBtGAi6nKP8bXa1BrzFyie342sdf9qrCi6JSz+Rjc=; b=G/WzJmEy9Vyx2IyuSJhI6ItMMT+P9h7kWyRZQB3baWkyY2gkTPoN+Y5PFkJdNPXK1DzAts yCLw4FEBrT9MftGr8tuEWbj/6GFtFOoftcNA0jrmf1+UAEYKc2lT8Anyslx43DRVWqQ8Mf UlTaJN04cS1eEM0MqRLhJeqG/PET9LfHL/GPac69AkftzHrK/U+l4dt75jNhO7l1FIKILa +XGdhlI+Wiutgi3ASTwGMR3yAcDDifA8msRBIqWqRqTjXiMZyjxpjdsXAzeNOh8v8IxyHd qwX2OAu5lxFOokXr+PUCrpJaxQkfKzptsbPFH4+mGH3uh0mCZU8SUMy7Q1OI2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779955057; a=rsa-sha256; cv=none; b=oFz8Tt9QmdUYlD8XurjPlK8WJhUjk/m+wawuylcj4J1QEa50v0ncaw5AX0srYhuXQciAFx ZYfqudtWntonFWtt0+Drj513A5MCdqXB2cwMCS0ZdQLQ1U1IP6y4a6bVGeUOllHSp2XCEN sSwCeN7SGWORytE4Edx8uA2GPMv59/IlnrsHFXSFoPZFaqt1Gt13kG+K63IGkLoKXAvQoV 81oPAIbsld1dA0WsxoBhpmLk9juNJHqEOxDFPfzTePF7NtyRGYfFqOXMBuhxPrqCPzMaUN FMJEazN1OQ8vD+aNuX20WHGBDaTnQRfYGQZRbH4t2SMWOTFI89qCjLmXVWKo9Q== 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=1779955057; 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=PAgBtGAi6nKP8bXa1BrzFyie342sdf9qrCi6JSz+Rjc=; b=WruJ6ZwL/XlMtH0ExbgEIxT4pKeTsMKl5FQT91s2XA7cSPWChvXYKxCECSEnYmrFwSJe6w Ef/ucr3nfj7rImKrQGT1nJlluehb4nCTHNW3cald5Pu4yVfIMbJB20HxLfVZmWcLrhAzGr FGm4YbSDrLP/ZVtZ6gxYq+KITcnj2c9Nl9bQtcnqDLfZ13vKn8wZ4IRLd9lifZZr1aeTvN 63HXoJ15ADWSasST2py0Ge0sEgzMYuvYhmeyatcVjQvBAu+p9+jK93PRcdzew6z4mWCir7 tF4PCJesqdR1bl0uRLpG/mlMvrU/KcW92gKDaIYY8pRPe4cGKaWzOYLJ4rGykw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQzNx5Z75zdfH for ; Thu, 28 May 2026 07:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20698 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 07:57:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ea10118fe373 - stable/15 - vfs_domount(): handle the case when vn_lock_pair() only locked once 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 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea10118fe3736cd079b335e0f471b9fa853460e4 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 07:57:37 +0000 Message-Id: <6a17f571.20698.d0d0db4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ea10118fe3736cd079b335e0f471b9fa853460e4 commit ea10118fe3736cd079b335e0f471b9fa853460e4 Author: Konstantin Belousov AuthorDate: 2026-05-17 21:27:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-28 07:57:14 +0000 vfs_domount(): handle the case when vn_lock_pair() only locked once (cherry picked from commit f5433e784078ee139a37eb43ffa1d9e0e1f4f217) --- sys/kern/vfs_mount.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 383ccf98c10e..9cea2d8acc64 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1281,7 +1281,8 @@ vfs_domount_first( * Use vn_lock_pair to avoid establishing an ordering between vnodes * from different filesystems. */ - vn_lock_pair(vp, false, LK_EXCLUSIVE, newdp, false, LK_EXCLUSIVE); + error1 = vn_lock_pair(vp, false, LK_EXCLUSIVE, newdp, false, + LK_EXCLUSIVE); VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; @@ -1291,7 +1292,10 @@ vfs_domount_first( TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); mtx_unlock(&mountlist_mtx); vfs_event_signal(NULL, VQ_MOUNT, 0); - VOP_UNLOCK(vp); + if (error1 == 0) + VOP_UNLOCK(vp); + else + MPASS(error1 == EDEADLK); EVENTHANDLER_DIRECT_INVOKE(vfs_mounted, mp, newdp, td); VOP_UNLOCK(newdp); mount_devctl_event("MOUNT", mp, false);