Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 May 2026 17:02:41 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: f2a89e7e1d87 - main - limits: Improve consistency
Message-ID:  <6a1723b1.3954e.554c9451@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=f2a89e7e1d87c5a3aaa243aff3f6086e7312ecf5

commit f2a89e7e1d87c5a3aaa243aff3f6086e7312ecf5
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-05-27 17:02:07 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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,


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1723b1.3954e.554c9451>