[illumos-gate merge]

commit cbff3abd8ecaa7b8e6a47457e0a5e562dbfc2cad
    6457 ucopystr can't find its way home
commit 7a5aac98bc37534537d4896efd4efd30627d221e
    3252 Need a proper flock() implementation

	Conflicts:
	usr/src/uts/common/os/flock.c
	usr/src/man/man3c/flock.3c
	usr/src/man/man2/fcntl.2
	usr/src/lib/libbc/libc/sys/common/flock.c

2 files changed, 0 insertions, 12 deletions

diff --git a/usr/src/man/man3c/flock.3c b/usr/src/man/man3c/flock.3c
index a0953f67f9..66e9bedde3 100644
--- a/usr/src/man/man3c/flock.3c
+++ b/usr/src/man/man3c/flock.3c
@@ -26,7 +26,6 @@ flock \- OFD(open file description)-style file locking
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBflock()\fR function allows advisory locks to be applied to and removed
 from a file. Calls to \fBflock()\fR from callers that attempt to lock
@@ -79,12 +78,10 @@ Sleeping on a resource is interrupted with any signal. The \fBalarm\fR(2)
 function may be used to provide a timeout facility in applications that require
 this facility.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fB0\fR is returned.  Otherwise, \fB\(mi1\fR is
 returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBflock()\fR function will fail if:
 .sp
@@ -165,7 +162,6 @@ supported.
 .RE
 
 .SH USAGE
-.sp
 .LP
 File-locking should not be used in combination with the \fBfopen\fR(3C),
 \fBfread\fR(3C), \fBfwrite\fR(3C) and other \fBstdio\fR functions.  Instead,
@@ -184,7 +180,6 @@ Locks created by this facility conflict with those created by the
 removed OFD-style locks; see \fBfcntl\fR(2) for information about the
 interaction between OFD-style and POSIX-style file locks.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -202,7 +197,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(2), \fBalarm\fR(2), \fBchmod\fR(2), \fBclose\fR(2), \fBcreat\fR(2),
 \fBfcntl\fR(2), \fBmmap\fR(2), \fBopen\fR(2), \fBread\fR(2), \fBwrite\fR(2),
diff --git a/usr/src/man/man3c/lockf.3c b/usr/src/man/man3c/lockf.3c
index 818dab24a2..53d607a4f1 100644
--- a/usr/src/man/man3c/lockf.3c
+++ b/usr/src/man/man3c/lockf.3c
@@ -20,7 +20,6 @@ lockf \- POSIX-style record locking on files
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlockf()\fR function allows sections of a file to be locked; advisory or
 mandatory write locks depending on the mode bits of the file (see
@@ -120,12 +119,10 @@ Sleeping on a resource is interrupted with any signal. The \fBalarm\fR(2)
 function may be used to provide a timeout facility in applications that require
 this facility.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fB0\fR is returned.  Otherwise, \fB\(mi1\fR is
 returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBlockf()\fR function will fail if:
 .sp
@@ -234,7 +231,6 @@ supported.
 .RE
 
 .SH USAGE
-.sp
 .LP
 Record-locking should not be used in combination with the \fBfopen\fR(3C),
 \fBfread\fR(3C), \fBfwrite\fR(3C) and other \fBstdio\fR functions.  Instead,
@@ -251,7 +247,6 @@ applications requiring it.
 The \fBlockf()\fR function has a transitional interface for 64-bit file
 offsets.  See \fBlf64\fR(5).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -269,7 +264,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(2), \fBalarm\fR(2), \fBchmod\fR(2), \fBclose\fR(2), \fBcreat\fR(2),
 \fBfcntl\fR(2), \fBmmap\fR(2), \fBopen\fR(2), \fBread\fR(2), \fBwrite\fR(2),