From nobody Wed Jul 1 09:25:40 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 4gqvkx53jVz6jvHg for ; Wed, 01 Jul 2026 09:25:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqvkx4Ktlz3ZVc for ; Wed, 01 Jul 2026 09:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782897945; 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=kz8PbnSxOSCrN9ejisTGDpSoK2wKjJlVyELGXbYksZY=; b=p8vROK3l19Dc3KI5c+rL+YM3XX2R/jYH1R8rSyptd8HVC7dfIFtgYdOag46LvMQW0F0PjR NxuSsRvJx2aFG4jDI6I5sdm44muUC1ItrCWJrKhC/S8NbN87Obv1ctR50ZUJ+2PQc4dl2H sLJCGT9Mr/xmAv0wjMQVXcA2Zpb9Hwvpg8Dk/Tntros8LboWPoomdQYFOW7Q4/A32dUqZC O4nG105oaNilv8yB4tkKIbnJbKcMzenSQGCwpBfLqYtikQAj1VqYq7HYwHR/ESQuHE5sC/ /2r5R/+nwI/Fnpo+1PKGiPUgazEvg3bjrUMtBxqTqTiE50/k2NKT4PJddXbVcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782897945; a=rsa-sha256; cv=none; b=AgUIopdgSxWAKTBq9luBkK8lBebIyNa1p7IFEICy/SgXFD4XuFnqNPi0czh2Y4qiNPTWfq 142h+WLChmiHkYABidRf9bo92HfOidlFL2DOagsTJewJ5GypoX0LAJ+1AVOV7RtUjL9vLS E15yFnPP9m5hLowsk0Bhl0NaFZZoLoF5X+KD93CZQdgtBIAskuSYDMrJOtakU76HFOEyJt rnyUHP/TABr1crOaNkaRnBSz7xeCLy2K4wBqfeT2SXUAr5PPNVOQ59PbjMvgWNQ9uPC80m e84jscGx1mvqWyZ3bIs5/q/PWEE9zWwDLnGkkpWu0zutGiY5EVdDiICWDwuESA== 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=1782897945; 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=kz8PbnSxOSCrN9ejisTGDpSoK2wKjJlVyELGXbYksZY=; b=et/ik8iShWa6FfIZE6PAbdeQHH87ngMcxPnyGrg2swpLE6iPn+hQs3HCKl5+e4z1oCjJeB 6VdsYq7xVigK7osACGyXJ3NHxwq+ob+SS3wEhzrbRdD2TO9aR/8ktosClv86YE44jXP6vA yrfqbwqOA5PXsoza1Psb9NCGhQ1Zkqz8w478SFl7Kr88DmaYlAIOerSERw8lzK3YXvzJtD nL8kux2eRl1C7pva+z3fOD5V3LUw5dJbJANV+iJ5sqiK9AQT46FmAwYdinG8CGSkor9Bf+ pslnGYXA/RPvqG4DuJc2R8B1h5LxfCpwa9LwkMQJbEC7VAzMb6ed9C2QTm89DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqvkx390kz1NK4 for ; Wed, 01 Jul 2026 09:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d08a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Jul 2026 09:25:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 29b07ef31379 - main - autofs: rename sx lock description for am_lock 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: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29b07ef31379575fff4344ec331b90c96d899cc7 Auto-Submitted: auto-generated Date: Wed, 01 Jul 2026 09:25:40 +0000 Message-Id: <6a44dd14.3d08a.43b191cb@gitrepo.freebsd.org> The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=29b07ef31379575fff4344ec331b90c96d899cc7 commit 29b07ef31379575fff4344ec331b90c96d899cc7 Author: Robert Wing AuthorDate: 2026-07-01 09:18:33 +0000 Commit: Robert Wing CommitDate: 2026-07-01 09:18:33 +0000 autofs: rename sx lock description for am_lock Rename am_lock description from autofslk -> autfsm. The lock description, autofslk, is used as the description for autofs_softc->sc_lock, which is used to protect autofs requests and the like as opposed to am_lock which protects autofs nodes for a given mount. This change allows witness to distinguish different lock orders for each lock. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D57972 --- sys/fs/autofs/autofs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c index 473a0b2280ac..2159902f8b40 100644 --- a/sys/fs/autofs/autofs_vfsops.c +++ b/sys/fs/autofs/autofs_vfsops.c @@ -86,7 +86,7 @@ autofs_mount(struct mount *mp) strlcpy(amp->am_mountpoint, fspath, sizeof(amp->am_mountpoint)); strlcpy(amp->am_options, options, sizeof(amp->am_options)); strlcpy(amp->am_prefix, prefix, sizeof(amp->am_prefix)); - sx_init(&->am_lock, "autofslk"); + sx_init(&->am_lock, "autfsm"); amp->am_last_fileno = 1; vfs_getnewfsid(mp);