about summary refs log tree commit diff
path: root/io
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2023-08-28 23:30:37 +0200
committerAurelien Jarno <aurelien@aurel32.net>2023-09-07 21:56:31 +0200
commit434bf72a94de68f0cc7fbf3c44bf38c1911b70cb (patch)
tree16ad905edb58e58dd7a3c6a6dd888445a0712e16 /io
parentd99609a3eb8bc96c3af841fd35294a679e0fea7f (diff)
downloadglibc-434bf72a94de68f0cc7fbf3c44bf38c1911b70cb.tar.gz
glibc-434bf72a94de68f0cc7fbf3c44bf38c1911b70cb.tar.xz
glibc-434bf72a94de68f0cc7fbf3c44bf38c1911b70cb.zip
io: Fix record locking contants for powerpc64 with __USE_FILE_OFFSET64
Commit 5f828ff824e3b7cd1 ("io: Fix F_GETLK, F_SETLK, and F_SETLKW for
powerpc64") fixed an issue with the value of the lock constants on
powerpc64 when not using __USE_FILE_OFFSET64, but it ended-up also
changing the value when using __USE_FILE_OFFSET64 causing an API change.

Fix that by also checking that define, restoring the pre
4d0fe291aed3a476a commit values:

Default values:
- F_GETLK: 5
- F_SETLK: 6
- F_SETLKW: 7

With -D_FILE_OFFSET_BITS=64:
- F_GETLK: 12
- F_SETLK: 13
- F_SETLKW: 14

At the same time, it has been noticed that there was no test for io lock
with __USE_FILE_OFFSET64, so just add one.

Tested on x86_64-linux-gnu, i686-linux-gnu and
powerpc64le-unknown-linux-gnu.

Resolves: BZ #30804.
Co-authored-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'io')
-rw-r--r--io/Makefile1
-rw-r--r--io/tst-fcntl-lock-lfs.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/io/Makefile b/io/Makefile
index 6ccc0e8691..8a3c83a3bb 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -192,6 +192,7 @@ tests := \
   tst-fchownat \
   tst-fcntl \
   tst-fcntl-lock \
+  tst-fcntl-lock-lfs \
   tst-fstatat \
   tst-fts \
   tst-fts-lfs \
diff --git a/io/tst-fcntl-lock-lfs.c b/io/tst-fcntl-lock-lfs.c
new file mode 100644
index 0000000000..f2a909fb02
--- /dev/null
+++ b/io/tst-fcntl-lock-lfs.c
@@ -0,0 +1,2 @@
+#define _FILE_OFFSET_BITS 64
+#include <io/tst-fcntl-lock.c>