]> git.ipfire.org Git - thirdparty/glibc.git/commit
io: Fix record locking contants for powerpc64 with __USE_FILE_OFFSET64
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 28 Aug 2023 21:30:37 +0000 (23:30 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Thu, 7 Sep 2023 20:45:43 +0000 (22:45 +0200)
commit5bdef6f27c91f45505ed5444147be4ed0e9bc3c7
tree2cfb7141923fa20c70ddfd848c581c9896cfcf32
parent1aed90c9c8f8be9f68b58e96b6e4cd0fc08eb2b1
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)
NEWS
io/Makefile
io/tst-fcntl-lock-lfs.c [new file with mode: 0644]
sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h