Add support for the F_OFD_SETLK, F_OFD_SETLKW, and F_OFD_GETLK fcntl
commands. BZ#337285.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14149 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/NEWS b/NEWS
index 9bd99a1..c692214 100644
--- a/NEWS
+++ b/NEWS
@@ -172,6 +172,7 @@
335441 unhandled ioctl 0x8905 (SIOCATMARK) when running wine under valgrind
335496 arm64: sbc/abc instructions are not implemented
336772 Make moans about unknown ioctls more informative
+337285 fcntl commands F_OFD_SETLK, F_OFD_SETLKW, and F_OFD_GETLK not supported
n-i-bz Fix KVM_CREATE_IRQCHIP ioctl handling
n-i-bz s390x: Fix memory corruption for multithreaded applications
n-i-bz vex arm->IR: allow PC as basereg in some LDRD cases
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index c195ca2..1b784f2 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -5205,6 +5205,9 @@
case VKI_F_SETLK64:
case VKI_F_SETLKW64:
# endif
+ case VKI_F_OFD_GETLK:
+ case VKI_F_OFD_SETLK:
+ case VKI_F_OFD_SETLKW:
PRINT("sys_fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd,
diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index fb65e03..ed6d564 100644
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -273,6 +273,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h
index eb12f2d..39fa6a9 100644
--- a/include/vki/vki-arm-linux.h
+++ b/include/vki/vki-arm-linux.h
@@ -274,6 +274,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
diff --git a/include/vki/vki-arm64-linux.h b/include/vki/vki-arm64-linux.h
index 4a16704..690505f 100644
--- a/include/vki/vki-arm64-linux.h
+++ b/include/vki/vki-arm64-linux.h
@@ -246,6 +246,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
diff --git a/include/vki/vki-mips32-linux.h b/include/vki/vki-mips32-linux.h
index a0aaea8..d694f1d 100644
--- a/include/vki/vki-mips32-linux.h
+++ b/include/vki/vki-mips32-linux.h
@@ -343,6 +343,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_GETLK64 33 /* using 'struct flock64' */
#define VKI_F_SETLK64 34
#define VKI_F_SETLKW64 35
diff --git a/include/vki/vki-mips64-linux.h b/include/vki/vki-mips64-linux.h
index bf49bb3..c95146e 100644
--- a/include/vki/vki-mips64-linux.h
+++ b/include/vki/vki-mips64-linux.h
@@ -348,6 +348,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_GETLK64 33 /* using 'struct flock64' */
#define VKI_F_SETLK64 34
#define VKI_F_SETLKW64 35
diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index f71dae5..6aea179 100644
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -341,6 +341,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index d239cab..7f74558 100644
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -390,6 +390,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
diff --git a/include/vki/vki-s390x-linux.h b/include/vki/vki-s390x-linux.h
index b878949..c380ec4 100644
--- a/include/vki/vki-s390x-linux.h
+++ b/include/vki/vki-s390x-linux.h
@@ -335,6 +335,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h
index 8f08038..c34e027 100644
--- a/include/vki/vki-x86-linux.h
+++ b/include/vki/vki-x86-linux.h
@@ -312,6 +312,10 @@
#define VKI_F_SETOWN_EX 15
#define VKI_F_GETOWN_EX 16
+#define VKI_F_OFD_GETLK 36
+#define VKI_F_OFD_SETLK 37
+#define VKI_F_OFD_SETLKW 38
+
#define VKI_F_OWNER_TID 0
#define VKI_F_OWNER_PID 1
#define VKI_F_OWNER_PGRP 2
