From ee6627733a04ebea2ceeebf73c43d375b5d1c591 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Wed, 21 Jan 2015 18:42:53 +0100 Subject: [PATCH] fcntl.2: Clarify cases of conflict between traditional record and OFD locks Verified by experiment on Linux 3.15 and 3.19rc4. Acked-by: Jeff Layton Signed-off-by: Michael Kerrisk --- man2/fcntl.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man2/fcntl.2 b/man2/fcntl.2 index e26c8da3d..9bb558251 100644 --- a/man2/fcntl.2 +++ b/man2/fcntl.2 @@ -498,7 +498,10 @@ and are only automatically released on the last close of the open file description, instead of being released on any close of the file. .PP -Open file description locks always conflict with traditional record locks, +Conflicting lock combinations +(i.e., a read lock and a write lock or two write locks) +where one lock is an open file description lock and the other +is a traditional record lock conflict even when they are acquired by the same process on the same file descriptor. Open file description locks placed via the same open file description