summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-09-07 17:12:21 +0000
committermartin <martin@NetBSD.org>2021-09-07 17:12:21 +0000
commit259bb9e767abaa392346fedb4ddd3048c8837020 (patch)
treead4784cde91ed3144571144c37b72d85754fe2b5 /share
parent308bc97e27ccca724751f847cf9f376705f3546a (diff)
Pull up following revision(s) (requested by manu in ticket #1343):
share/man/man7/sysctl.7: revision 1.153 sys/kern/vfs_lockf.c: revision 1.74 lib/libc/sys/fcntl.2: revision 1.46 lib/libc/sys/flock.2: revision 1.23 Tie the maximum file lock per unprivilegied uid to kern.maxfiles This makes the limit simple to raise at run time. While there, document that fcntl(2) and flock(2) may return ENOMEM when this limit is reached.
Diffstat (limited to 'share')
-rw-r--r--share/man/man7/sysctl.77
1 files changed, 6 insertions, 1 deletions
diff --git a/share/man/man7/sysctl.7 b/share/man/man7/sysctl.7
index 3b2c27a9ea2..dac1e279772 100644
--- a/share/man/man7/sysctl.7
+++ b/share/man/man7/sysctl.7
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysctl.7,v 1.139.2.1 2019/11/18 19:45:00 martin Exp $
+.\" $NetBSD: sysctl.7,v 1.139.2.2 2021/09/07 17:12:21 martin Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -736,6 +736,11 @@ Memory Mapped Files Option is available on this system,
otherwise\ 0.
.It Li kern.maxfiles ( Dv KERN_MAXFILES )
The maximum number of open files that may be open in the system.
+This also controls the maximum file locks per unprivilegied user
+enforced by
+.Xr fnctl 2
+and
+.Xr flock 2 .
.It Li kern.maxpartitions ( Dv KERN_MAXPARTITIONS )
The maximum number of partitions allowed per disk.
.It Li kern.maxlwp