From nobody Thu Oct 01 16:12:33 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 4hwcPt0f0rz6vC9t for ; Thu, 01 Oct 2026 16:12:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwcPs4nlbz4Sf7 for ; Thu, 01 Oct 2026 16:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790871153; 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=cN3dyDlKspb3IbtHCHBjaM1A7UmVDJuuN3uWVywqPY0=; b=XBJvTUmyZnkyDq4vrIX3ZCg7iIHuV08zFsqtP2ZbeQrSVLWppxKmYc4veKUe+5/TQB2q81 0pX4O2Od4PDrx1OBoVKqRNd4kHYHCz7uMLzd8bXmbW92ApzSMaCKa09t/bb17R2E3ykZus CoBP6TnuHhWgzjMUq97AS3JH5geU4xRjnVRoq9iQuvbV7PciPLjop9TaoZsko2HXMbCZyw NMYeipejdMUSdlBsZDUhooYamgNmXWI9RryJTM/5dpKJ1NGURZq2yvWLbrkrtYBkwXKwVT XydeqZltZc9of3GTkdR5lUqG7BQJEVbxLyl7sVjN6SaEzXI1ZAT7YTKg1cyEHQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790871153; b=DBncoAalvg3DwW129zJC4AUQz5E5wuajW7/WlWw+nGVsNLl06swD4pP+K+kEVbRT8yzRbU DOvW3rgS3hV6PWtT9LfvLXgxMcNUvIPJBjJrWQhCHBgB8sNr9lbn8ALrUIFs2W8W7BU5r3 cpwJ6GxEzaUwQMQYBdGtb/8IUTluSxDtNwB0JESLYUu3eQzu2ar1E4MPz23BiDO6yHrjsC d93Ee6SGKFu4E3LpwBv2W02RgsFFEwzqO7bI/c10Zx/cvH5Cf6I8L7mSPsI6XdZ1k6+0gA 0bD5gjG1L2woW+PDgURjg8ADCzDmVb8fH38bHJMYXtqgFRg0jK5Kw5vSrw6pqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790871153; 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=cN3dyDlKspb3IbtHCHBjaM1A7UmVDJuuN3uWVywqPY0=; b=LARK4T4IznEJbhZZ44DH38uEGVgOCy3QPS0YvMBS3SdbSmhKMW2s8ab4jbqEK60F6nEuaB ok8qQwhswCttQ3QSFavYjZbrX8wQ4iYVY9bU/wwyTIDEAGf1BxyLDDjBmumNQWk6oSdooG LDSqVuaih+P2aboYFYWcMHRpQbWTDSe4cW1+HS4K26a9VrHQPvuUETMqgwCgXMl4WzhKWm UE+WwNqkQ/iMuGf3IGsfC7XdMx7ewDK+3NvJfoIgWCzMA3uJuHnUViVhvx+DHsLMuYB2gR A2fUjim4/pv2MdV337Opt4xBPNPNqU7lUQt7ptTUfIu0S/+btv168OfwTfJcLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwcPs3sxqzfjf for ; Thu, 01 Oct 2026 16:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40427 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 16:12:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f117b6ba9f7c - stable/14 - lockf: Do not block in vfs_busy() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f117b6ba9f7ccea25a105471478b81e0438a3082 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 16:12:33 +0000 Message-Id: <6abe8671.40427.35ea6efd@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f117b6ba9f7ccea25a105471478b81e0438a3082 commit f117b6ba9f7ccea25a105471478b81e0438a3082 Author: Mark Johnston AuthorDate: 2026-09-24 16:14:34 +0000 Commit: Mark Johnston CommitDate: 2026-10-01 13:42:56 +0000 lockf: Do not block in vfs_busy() A race is possible otherwise: vfs_busy() may return after an unmounted filesystem has been removed from the global mount list. That is, vfs_busy() will block until vfs_mount_destroy() sets MNTK_REFEXPIRE, and at that point the mountpoint has been removed from the mountlist, so TAILQ_FOREACH can return an invalid value. Simply do not block if the mountpoint is being unmounted. Reviewed by: kib Fixes: eca39864f702 ("Add sysctl KERN_LOCKF") MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59982 (cherry picked from commit dd16a5f53b0b2e967d20d2900f18fc320997679b) --- sys/kern/kern_lockf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index 4d99c65495c0..961f74e05d08 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -2559,7 +2559,7 @@ sysctl_kern_lockf_run(struct sbuf *sb) error = 0; mtx_lock(&mountlist_mtx); TAILQ_FOREACH(mp, &mountlist, mnt_list) { - error = vfs_busy(mp, MBF_MNTLSTLOCK); + error = vfs_busy(mp, MBF_MNTLSTLOCK | MBF_NOWAIT); if (error != 0) continue; error = mp->mnt_op->vfs_report_lockf(mp, sb);