From nobody Thu May 21 20:13:15 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 4gM02z6Pb7z6dqd2 for ; Thu, 21 May 2026 20:13:15 +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 4gM02z54zLz3tSs for ; Thu, 21 May 2026 20:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779394395; 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=iBswLW41NERxMh8NuW3L2Mb5MkT9a8B+xkwqKAE50Xk=; b=ncDLWRa16hgUBg6I+X8pFBPXfdJ8NC9L7UwCPgLfQzg2c5sQcODAIR1h+njkF4fWh7HYx0 LL0uf8BmVJL4Cp6jAM0qqQ7ddiDI1KNOmA4ad7aYVg51Xmz8js4NR1+lwhGYlSJAczVwYU NPsZpiRjBpbKxOdfdW1gUsqpGMxnTdYCzz/H7VAtP+LSNHJQJbjQAAhlCfA1De8KBZTtgT sYPQUcZSmvwRj2tjKLZxQZeQMGtlELnLqNNg81NxttjEOsu7xin32xHk3oJ9xFdzWkSmLR BzqxPnrXaFI2nwzR9j1vjDWfAZ1+I7kgv3jD77lwiX4yZGg4eDkOkOR0L/lnQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779394395; a=rsa-sha256; cv=none; b=WYCgw7SXgyrfRFgT4Ux09KVkI7XX94Mgp6HyDaUGLQT0CzELdpc80ExVkmbTd69DmQdKuG CDBLoRnbLPfAAD0n1vaYR4aKf+be7hsTsKeDwLhfcgkbKjcQLqOJGMVYtrDLwhqJrl1OY7 FQjKHnYjx39J54MreXm7QKU1EPxMKQcfhTi2ejMLuG6KbgWq26ko+R52E0uolCaxy9kVX7 MWjukFHaK8YdCRfIGyYLurWMU9cdarZHaPhmb9pIZuqkXKP0o7VfwJN3JqJ/uVSfbd9jFL sVchvFxFMgPrqqzIrDpYL7FtDI7hcFJ79+qFA9tdb3Wf1MH53DoJTB1yjLbtdA== 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=1779394395; 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=iBswLW41NERxMh8NuW3L2Mb5MkT9a8B+xkwqKAE50Xk=; b=kZmLas6dr9Og6Z8kAwEu3cZKjp6+i+Yv8QvnlAR10oUX5veJPlj1pAkT6RNp20fLmBPddM Axx8IoEpxrcO0MLF76BnTH87wfxItjMJSGJv1LGnO6o+WnpQI+IZRTGLxkjN+foLVZcnKX NlYi8zkILB99Z2Ur8BCez/Aij++JIOOquj3tEH9mTzhf3njNdwTo5RHZTyDQT8vtGlhqq/ w4cPoRy9bPFSjiLJj53LeBd6m8HQs2+IvuKwkV0jXtQLFXd+De3d9EugfyPdyYFqk+1Ucy QAcKW43PU+qabESWwH6UH3Jqf+e2awyhBL9YGAQi/iQkTM7di/Z2RmuByhc51Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gM02z4RJHznyj for ; Thu, 21 May 2026 20:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b8e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 20:13:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f5433e784078 - main - vfs_domount(): handle the case when vn_lock_pair() only locked once 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5433e784078ee139a37eb43ffa1d9e0e1f4f217 Auto-Submitted: auto-generated Date: Thu, 21 May 2026 20:13:15 +0000 Message-Id: <6a0f675b.3b8e4.4b84e032@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f5433e784078ee139a37eb43ffa1d9e0e1f4f217 commit f5433e784078ee139a37eb43ffa1d9e0e1f4f217 Author: Konstantin Belousov AuthorDate: 2026-05-17 21:27:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-21 20:11:55 +0000 vfs_domount(): handle the case when vn_lock_pair() only locked once Reviewed by: jah, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57035 --- 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 fff05a627162..d7e6683e0446 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1292,7 +1292,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; @@ -1302,7 +1303,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);