From nobody Wed May 27 17:02:41 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 4gQbXK75SCz6fLLX for ; Wed, 27 May 2026 17:02:41 +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 4gQbXK6YL1z3rYk for ; Wed, 27 May 2026 17:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779901361; 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=cOA285zLHtr9eKnVWRbEsRg6VGXvQofk5Gg9mk3eXlc=; b=ZKs1carXLRy8ooj38mEF2qp/1TTKxVXExpnUvdhaKtCuL+aZh4ylH/IMrIuNJlNAZqlZgd UnitXM24MDieeZ1WQ026RRhkdHgeATStBEhBEhuJrlBVhWEGsYNoqjRz280jnii+DdGR6d cCYybIqh1gC2Umcc4xteAhF1QUUxCUVD9rlpioqaiYjjWbwE5BVXesMTz3C/Fg8a84EDj/ 0aIAFQhyTQJfxzHAs8/oa7mSWgfuQsUEhC+8mf7ShZfWMwpnvXSJC67HebKRU2O5/yEPuo b125COC+vfRNXcslLIeY91lK83TTGR/jlec7OZjxYNrPYGXjqERI6R7WvYUb6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779901361; a=rsa-sha256; cv=none; b=LY1kK8KrsJbuZ6XDIjoRxtWDZwx9piDbYHV2tWHeDqk6BSttVBPeZNaoH0D++E0QcBLLKk 0DLvY8ECm9KM/VkPzO3l0B//XNt+W3RDCehHuHmSAr8P7De3D6+VcvHsPXnsBJy499vWut lmoa1VV8B+f7a51w66LW0hIa0ggChyNc9rx0NV7gkFiEmhYTp5XMCtl/jExF9s7ZugGaIJ BvG74NneAQKiaxf8+tvI8DWCUB1OFLE1N+GnvZFliHiLw2b15m5U0us6yEQIQmaQYLt0z4 y11+Xny2e60AkUNHglRrOzStzz69oxUZFTENfuvsOG9Sz4LZwpA2xtM/rTUm5Q== 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=1779901361; 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=cOA285zLHtr9eKnVWRbEsRg6VGXvQofk5Gg9mk3eXlc=; b=qHr+ud4NUTv1Rb+Z/AsDTeLxEk90lpLIi6R+SV5tzP7Kbwd+c/y3eFKTUkkPy3jWeZxMBa DrV8xAbz1saOpkffG+OXyI8arz25uG3X12GGd0z2qOiuLUOd2wFwv+uHhX8kdnxcWHIvna D1bmCpsoaIpYiYLq9s+apvgQtsE+GfgYQBLOJBJwPSrK5qw5NOJlWE6RnvQlmK+WR2Tz1M +YRKJivPoiqQO5elGEQ3BAxk+FnF5WW+vM3bJpXRRIm7IpAWOECA4HNUpW19LpZ2u+uMD4 FR6PWhXG4IC0iysLWESTJ4Y0kYkmdczYiIQs+sqjk/aV/eTLIf4IVRTJN5O1+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQbXK5wt5z17Xn for ; Wed, 27 May 2026 17:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3954e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 17:02:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f2a89e7e1d87 - main - limits: Improve consistency 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a89e7e1d87c5a3aaa243aff3f6086e7312ecf5 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 17:02:41 +0000 Message-Id: <6a1723b1.3954e.554c9451@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f2a89e7e1d87c5a3aaa243aff3f6086e7312ecf5 commit f2a89e7e1d87c5a3aaa243aff3f6086e7312ecf5 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-27 17:02:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-27 17:02:07 +0000 limits: Improve consistency Historical precedent seems pretty consistent: size limits have singular names, number limits have plural names. RLIMIT_VMM broke this, and I made matters worse by referring to this limit as “vmms” in limits(1). Consistently use “vms” everywhere user-visible, while leaving the question of whether or not to rename RLIMIT_VMM itself for another day. Fixes: 1092ec8b3375 ("kern: Introduce RLIMIT_VMM") Fixes: 53af2026f213 ("limits: Unbreak after RLIMIT_VMM addition") Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D57265 --- sys/sys/resource.h | 2 +- usr.bin/limits/limits.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 9e0635cdb328..6d8d17a05e02 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -145,7 +145,7 @@ static const char *rlimit_ident[] = { "kqueues", "umtx", "pipebuf", - "vmm", + "vms", }; #endif diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index fbb19289e6ca..a6e95e7c37a9 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -247,7 +247,7 @@ static struct { { "kqueues", login_getcapnum }, { "umtxp", login_getcapnum }, { "pipebuf", login_getcapnum }, - { "vmms", login_getcapnum }, + { "vms", login_getcapnum }, }; _Static_assert(nitems(resources) == RLIM_NLIMITS,