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>
(cherry picked from commit 434bf72a94de68f0cc7fbf3c44bf38c1911b70cb)

diff --git a/NEWS b/NEWS
index 0ec70a1b97f3c1935c2e5c95dd96d6629d6d4d89..e8a318e6314cba3b369d36fc47dc3096c91a3ae2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -131,6 +131,8 @@ The following bugs are resolved with this release:
     coincides with offset change
   [30039] stdio: __vsprintf_internal does not handle unspecified buffer
     length in fortify mode
+  [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
+    -D_FILE_OFFSET_BITS=64
 \f
 Version 2.36
 

diff --git a/io/Makefile b/io/Makefile
index 587b057209432ce7465a6af7fe1e3eaf851c454d..069e6751886b6f43c00aa4c329c963edd339943a 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -59,6 +59,7 @@ routines :=                                                           \
        ftw64-time64                                                    \
        closefrom close_range
 
+
 others         := pwd
 test-srcs      := ftwtest ftwtest-time64
 tests          := test-utime test-stat test-stat2 test-lfs tst-getcwd \
@@ -81,7 +82,8 @@ tests         := test-utime test-stat test-stat2 test-lfs tst-getcwd \
                   tst-closefrom \
                   tst-close_range \
                   tst-ftw-bz28126 \
-                  tst-fcntl-lock
+                  tst-fcntl-lock \
+                  tst-fcntl-lock-lfs
 
 tests-time64 := \
   tst-fcntl-time64 \

diff --git a/io/tst-fcntl-lock-lfs.c b/io/tst-fcntl-lock-lfs.c
new file mode 100644 (file)
index 0000000..f2a909f
--- /dev/null
+++ b/io/tst-fcntl-lock-lfs.c
@@ -0,0 +1,2 @@
+#define _FILE_OFFSET_BITS 64
+#include <io/tst-fcntl-lock.c>

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index f7615a447e27f2307f1a15bb68638ebe6c4bccbb..d8a291a33197561790a4e99f9db9693b19ffd98b 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -33,7 +33,7 @@
 # define __O_LARGEFILE 0200000
 #endif
 
-#if __WORDSIZE == 64
+#if __WORDSIZE == 64 && !defined __USE_FILE_OFFSET64
 # define F_GETLK       5
 # define F_SETLK       6
 # define F_SETLKW      7