summaryrefslogtreecommitdiff
path: root/lib
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 /lib
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 'lib')
-rw-r--r--lib/libc/sys/fcntl.26
-rw-r--r--lib/libc/sys/flock.26
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 6903477e6d6..f0041d8f378 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -1,4 +1,4 @@
-.\" $NetBSD: fcntl.2,v 1.41 2013/12/28 20:03:22 dholland Exp $
+.\" $NetBSD: fcntl.2,v 1.41.28.1 2021/09/07 17:12:21 martin Exp $
.\"
.\" Copyright (c) 1983, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -501,6 +501,10 @@ or
.Dv F_SETLKW ,
and satisfying the lock or unlock request would result in the
number of locked regions in the system exceeding a system-imposed limit.
+.It Bq Er ENOMEM
+The file lock limit for the current unprivilegied user
+has been reached. It can be modified using sysctl
+.Li kern.maxfiles .
.It Bq Er ESRCH
.Fa cmd
is
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index 3d47e7dac86..f67d599a9be 100644
--- a/lib/libc/sys/flock.2
+++ b/lib/libc/sys/flock.2
@@ -1,4 +1,4 @@
-.\" $NetBSD: flock.2,v 1.22 2011/10/15 21:35:50 rmind Exp $
+.\" $NetBSD: flock.2,v 1.22.44.1 2021/09/07 17:12:21 martin Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -137,6 +137,10 @@ does not include exactly one of
.Dv LOCK_SH ,
or
.Dv LOCK_UN .
+.It Bq Eq ENOMEM
+The file lock limit for the current unprivilegied user
+has been reached. It can be modifed using sysctl
+.Li kern.maxfiles .
.It Bq Er EOPNOTSUPP
The argument
.Fa fd