From nobody Wed Jul 1 09:25:40 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 4gqvkr3xz7z6jv3t for ; Wed, 01 Jul 2026 09:25:40 +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 4gqvkr2glHz3ZRs for ; Wed, 01 Jul 2026 09:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782897940; 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=CFFV1uJz6gDWMOlb7noc0xUaFWu89Etgz7sxiiWrBUXmA6j08fKUgH4+BtNSalWyWipp6e d9EzwWKDFvX2kVgNFDO67bgef/50a9wtv1owCfESxyU7IKIgiLP5kK7XH/ZcXDcoJ9L+4G iMe7txviyyz6KTEwGSzsftZeLDmvoyqFhSHGhgfSz+0s6zfTajvohM52CKvL/HfCGQSBVz f2KF+9gUjKJxbYuK1WLvub0NLVUI07/MRhnCuYPpTPdlYd9xBSCNB5k4OLYUHajDk/Nxf+ 20HWUuHTt5aej4f99eV54tosugEeTD+bETDroSr9JKtWluf98kFFQ32JXZADMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782897940; a=rsa-sha256; cv=none; b=fzd2gMnHTNeVDBwFqdxq2mYz5vXf/oEnceFDdAbbRU7fAaKN520s4RyfGd1btlOsE29iQj hhsPmKPRBCov18hOFxDpvLUTc//x4yNhLt4st8st9/LZQTYcYAuEwLCQAZ4zyYalMB3try jgNfJRoYxAATdpfvIS7TlZnaRHQYD00rng+QynHZEJDjzCM9IUPJkOZsaKOYUhraUoBiD1 NRDMAJzfESEqxp/KsX+DUzo1nO8kVWzZhdSWE58BeNoJAj8chULq8TqpGjHQVMIZz7h3CJ 7M2RE0LBQhky+KGUVh++UXpl7KR432C0tVLKQUXpaLCGz1c4W5RerXo6sSctiw== 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=1782897940; 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=FQ1cTvIINFKfOXoE4TSKY3WbxuVq3awCiWTtgY5GuMLCkP1FRe+uMb/kT1s3AVIkXwfY5u 1b7tNMZ3n1SN9VJKYKStFuYFpGT0V7sZXnxMu7bhC6BVuyXBEjy1F8AdxyM9nwr9fVXKHK kZC8O1FdQtQFCDJh4H+6OOIeAz/W4qL7ix6pOBlR7jneI05Cff3P0RwqZyw25th08nDULl JxSifMJLnPryJYaywkpn+VIsSuE+vS8oCcFeN7zOPs8/NnyGbCVlLCvpBXddHB5FtlXeKW wlumeFEPDhWI3pAy3j/XYRY2RDJBwk2laY7UcZ7Q2TtN8B0g4SMu+LXW+WJAqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqvkr1k2mz1NG2 for ; Wed, 01 Jul 2026 09:25:40 +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 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: 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);