mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

io: Fix record locking contants for powerpc64 with __USE_FILE_OFFSET64

Browse Source 
Commit 5f828ff824 ("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
4d0fe291ae 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 434bf72a94)
This commit is contained in:
Aurelien Jarno 2023-08-28 23:30:37 +02:00
parent 0d500bfdc0
commit be26b29262
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -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
Version 2.36

4
io/Makefile
View File

@ -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 \

2
io/tst-fcntl-lock-lfs.c Normal file
View File

@ -0,0 +1,2 @@
#define _FILE_OFFSET_BITS 64
#include <io/tst-fcntl-lock.c>

2
sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
View File

@ -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