Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/upstream/archlinux/man3/lockf.3 b/upstream/archlinux/man3/lockf.3
index fee68f61..ff447267 100644
--- a/upstream/archlinux/man3/lockf.3
+++ b/upstream/archlinux/man3/lockf.3
@@ -7,7 +7,7 @@
 .\" Added section stuff, aeb, 2002-04-22.
 .\" Corrected include file, drepper, 2003-06-15.
 .\"
-.TH lockf 3 2023-10-31 "Linux man-pages 6.06"
+.TH lockf 3 2024-05-02 "Linux man-pages 6.8"
 .SH NAME
 lockf \- apply, test or remove a POSIX lock on an open file
 .SH LIBRARY
@@ -17,7 +17,7 @@ Standard C library
 .nf
 .B #include <unistd.h>
 .P
-.BI "int lockf(int " fd ", int " cmd ", off_t " len );
+.BI "int lockf(int " fd ", int " op ", off_t " len );
 .fi
 .P
 .RS -4
@@ -37,7 +37,7 @@ Apply, test, or remove a POSIX lock on a section of an open file.
 The file is specified by
 .IR fd ,
 a file descriptor open for writing, the action by
-.IR cmd ,
+.IR op ,
 and the section consists of byte positions
 .IR pos .. pos + len \-1
 if
@@ -118,7 +118,7 @@ been memory-mapped by another process.
 .B EBADF
 .I fd
 is not an open file descriptor; or
-.I cmd
+.I op
 is
 .B F_LOCK
 or
@@ -128,7 +128,8 @@ and
 is not a writable file descriptor.
 .TP
 .B EDEADLK
-The command was
+.I op
+was
 .B F_LOCK
 and this lock operation would cause a deadlock.
 .TP
@@ -139,7 +140,7 @@ delivery of a signal caught by a handler; see
 .TP
 .B EINVAL
 An invalid operation was specified in
-.IR cmd .
+.IR op .
 .TP
 .B ENOLCK
 Too many segment locks open, lock table is full.