Date: Wed, 01 Jul 2026 09:25:40 +0000 From: Robert Wing <rew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 29b07ef31379 - main - autofs: rename sx lock description for am_lock Message-ID: <6a44dd14.3d08a.43b191cb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=29b07ef31379575fff4344ec331b90c96d899cc7 commit 29b07ef31379575fff4344ec331b90c96d899cc7 Author: Robert Wing <rew@FreeBSD.org> AuthorDate: 2026-07-01 09:18:33 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a44dd14.3d08a.43b191cb>