summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/syscall
diff options
context:
space:
mode:
authorCody Peter Mello <cody.mello@joyent.com>2016-10-17 13:50:27 -0700
committerRobert Mustacchi <rm@joyent.com>2016-10-18 11:10:15 -0700
commit90221f9148b67fdc90178b67f9600b7bd4e3bc7c (patch)
tree1bd5e4730fe606315d256e3ea28990bc4d5deb65 /usr/src/uts/common/syscall
parent10a404923096d60a26c785c3cee15a5c364d51c0 (diff)
downloadillumos-joyent-90221f9148b67fdc90178b67f9600b7bd4e3bc7c.tar.gz
7427 Double flock(3C) causes undue block
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Patrick Mooney <patrick.mooney@joyent.com> Reviewed by: Gordon Ross <gordon.w.ross@gmail.com> Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/uts/common/syscall')
-rw-r--r--usr/src/uts/common/syscall/fcntl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/syscall/fcntl.c b/usr/src/uts/common/syscall/fcntl.c
index 371bc83c29..e9a97da97c 100644
--- a/usr/src/uts/common/syscall/fcntl.c
+++ b/usr/src/uts/common/syscall/fcntl.c
@@ -365,7 +365,8 @@ fcntl(int fdes, int cmd, intptr_t arg)
}
}
- if (cmd == F_OFD_SETLK || cmd == F_OFD_SETLKW) {
+ if (cmd == F_OFD_GETLK || cmd == F_OFD_SETLK ||
+ cmd == F_OFD_SETLKW) {
/*
* TBD OFD-style locking is currently limited to
* covering the entire file.