OSDN Git Service
(root)
/
linuxjm
/
LDP_man-pages.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LDP: Update original to LDP v3.68
[linuxjm/LDP_man-pages.git]
/
original
/
man2
/
flock.2
diff --git
a/original/man2/flock.2
b/original/man2/flock.2
index
838cc7e
..
7ea4970
100644
(file)
--- a/
original/man2/flock.2
+++ b/
original/man2/flock.2
@@
-32,7
+32,7
@@
.\" FIXME: Maybe document LOCK_MAND, LOCK_RW, LOCK_READ, LOCK_WRITE
.\" which only have effect for SAMBA.
.\"
.\" FIXME: Maybe document LOCK_MAND, LOCK_RW, LOCK_READ, LOCK_WRITE
.\" which only have effect for SAMBA.
.\"
-.TH FLOCK 2 201
3-02-11
"Linux" "Linux Programmer's Manual"
+.TH FLOCK 2 201
4-04-22
"Linux" "Linux Programmer's Manual"
.SH NAME
flock \- apply or remove an advisory lock on an open file
.SH SYNOPSIS
.SH NAME
flock \- apply or remove an advisory lock on an open file
.SH SYNOPSIS
@@
-73,7
+73,8
@@
A single file may not simultaneously have both shared and exclusive locks.
Locks created by
.BR flock ()
Locks created by
.BR flock ()
-are associated with an open file table entry.
+are associated with an open file description (see
+.BR open (2)).
This means that duplicate file descriptors (created by, for example,
.BR fork (2)
or
This means that duplicate file descriptors (created by, for example,
.BR fork (2)
or
@@
-212,3
+213,12
@@
and occurs on many other implementations.)
in the Linux kernel source tree
.RI ( Documentation/locks.txt
in older kernels)
in the Linux kernel source tree
.RI ( Documentation/locks.txt
in older kernels)
+.SH COLOPHON
+This page is part of release 3.68 of the Linux
+.I man-pages
+project.
+A description of the project,
+information about reporting bugs,
+and the latest version of this page,
+can be found at
+\%http://www.kernel.org/doc/man\-pages/.