X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=original%2Fman2%2Fflock.2;h=7ea4970a9092fed30782194d5e2182cf3ab1ed99;hb=110dba020f489b75aff2497105f7970c05e2b87c;hp=f0d85aff1f7aeb207c2682c4986d5e1698746edc;hpb=c03a7a882c608ebf399d1b044ce7a6daa922351a;p=linuxjm%2FLDP_man-pages.git

diff --git a/original/man2/flock.2 b/original/man2/flock.2
index f0d85aff..7ea4970a 100644
--- a/original/man2/flock.2
+++ b/original/man2/flock.2
@@ -1,8 +1,7 @@
-.\" Hey Emacs! This file is -*- nroff -*- source.
-.\"
 .\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) and
 .\" and Copyright 2002 Michael Kerrisk
 .\"
+.\" %%%LICENSE_START(VERBATIM)
 .\" Permission is granted to make and distribute verbatim copies of this
 .\" manual provided the copyright notice and this permission notice are
 .\" preserved on all copies.
@@ -18,10 +17,11 @@
 .\" the use of the information contained herein.  The author(s) may not
 .\" have taken the same level of care in the production of this manual,
 .\" which is licensed free of charge, as they might when working
-
+.\" professionally.
 .\"
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
+.\" %%%LICENSE_END
 .\"
 .\" Modified Fri Jan 31 16:26:07 1997 by Eric S. Raymond <esr@thyrsus.com>
 .\" Modified Fri Dec 11 17:57:27 1998 by Jamie Lokier <jamie@imbolc.ucc.ie>
@@ -31,7 +31,8 @@
 .\"
 .\" FIXME: Maybe document LOCK_MAND, LOCK_RW, LOCK_READ, LOCK_WRITE
 .\"        which only have effect for SAMBA.
-.TH FLOCK 2 2009-07-25 "Linux" "Linux Programmer's Manual"
+.\"
+.TH FLOCK 2 2014-04-22 "Linux" "Linux Programmer's Manual"
 .SH NAME
 flock \- apply or remove an advisory lock on an open file
 .SH SYNOPSIS
@@ -65,15 +66,15 @@ A call to
 may block if an incompatible lock is held by another process.
 To make a nonblocking request, include
 .B LOCK_NB
-(by
-.IR OR ing)
+(by ORing)
 with any of the above operations.
 
 A single file may not simultaneously have both shared and exclusive locks.
 
 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
@@ -94,7 +95,7 @@ An attempt to lock the file using one of these file descriptors
 may be denied by a lock that the calling process has
 already placed via another descriptor.
 
-A process may only hold one type of lock (shared or exclusive)
+A process may hold only one type of lock (shared or exclusive)
 on a file.
 Subsequent
 .BR flock ()
@@ -108,7 +109,7 @@ are preserved across an
 
 A shared or exclusive lock can be placed on a file regardless of the
 mode in which the file was opened.
-.SH "RETURN VALUE"
+.SH RETURN VALUE
 On success, zero is returned.
 On error, \-1 is returned, and
 .I errno
@@ -135,7 +136,7 @@ The kernel ran out of memory for allocating lock records.
 The file is locked and the
 .B LOCK_NB
 flag was selected.
-.SH "CONFORMING TO"
+.SH CONFORMING TO
 4.4BSD (the
 .BR flock ()
 call first appeared in 4.2BSD).
@@ -198,7 +199,8 @@ was specified.
 and occurs on many other implementations.)
 .\" Kernel 2.5.21 changed things a little: during lock conversion
 .\" it is now the highest priority process that will get the lock -- mtk
-.SH "SEE ALSO"
+.SH SEE ALSO
+.BR flock (1),
 .BR close (2),
 .BR dup (2),
 .BR execve (2),
@@ -207,8 +209,16 @@ and occurs on many other implementations.)
 .BR open (2),
 .BR lockf (3)
 
-See also
-.I Documentation/filesystem/locks.txt
-in the kernel source
+.I Documentation/filesystems/locks.txt
+in the Linux kernel source tree
 .RI ( Documentation/locks.txt
-in older kernels).
+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/.