diff --git a/man2/flock.2 b/man2/flock.2 index f10dcdfe4..8c74c5839 100644 --- a/man2/flock.2 +++ b/man2/flock.2 @@ -151,7 +151,7 @@ Since kernel 2.0, is implemented as a system call in its own right rather than being emulated in the GNU C library as a call to .BR fcntl (2). -This yields true BSD semantics: +This yields classical BSD semantics: there is no interaction between the types of lock placed by .BR flock () @@ -160,6 +160,14 @@ and and .BR flock () does not detect deadlock. +(Note, however, that on some modern BSDs, +.\" E.g., according to the flock(2) man page, FreeBSD since at least 5.3 +.BR flock () +and +.BR fcntl (2) +locks +.I do +interact with one another.) .PP In Linux kernels up to 2.6.11, .BR flock ()