From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1778) id DA1453858D33; Sat, 16 Sep 2023 09:11:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA1453858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694855509; bh=vN03e8os4KyNL1Dfmm07+ZZWIIGqTI0fyr4kzEHKQ3o=; h=From:To:Subject:Date:From; b=Ncnr9kysfdRyRCRo4afGiAPtmJqqzfT3+k36NpUShqTNF/21Z9ls/pzTFcpM64S1Z AdQyzC7AXUIBYTWp5nN7mFrlYT8V3tOhtyhmnuzf1w+Obeu5MnCGUrWWH9lDIUgELU JqVC3gCXvAo1F+70AGUuV8L4+2tm0WOfrKpWCmXQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aurelien Jarno To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] io: Fix record locking contants for powerpc64 with __USE_FILE_OFFSET64 X-Act-Checkin: glibc X-Git-Author: Aurelien Jarno X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: e3ccb230a961b4797510e6a1f5f21fd9021853e7 X-Git-Newrev: 762a747faefad05cbfa463a1e7f7b00684d56f77 Message-Id: <20230916091149.DA1453858D33@sourceware.org> Date: Sat, 16 Sep 2023 09:11:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=762a747faefad05cbfa463a1e7f7b00684d56f77 commit 762a747faefad05cbfa463a1e7f7b00684d56f77 Author: Aurelien Jarno Date: Mon Aug 28 23:30:37 2023 +0200 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 Signed-off-by: Aurelien Jarno (cherry picked from commit 434bf72a94de68f0cc7fbf3c44bf38c1911b70cb) Diff: --- NEWS | 2 ++ io/Makefile | 4 +++- io/tst-fcntl-lock-lfs.c | 2 ++ sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 9e78e83214..94adcee263 100644 --- a/NEWS +++ b/NEWS @@ -83,6 +83,8 @@ The following bugs are resolved with this release: [30477] libc: [RISCV]: time64 does not work on riscv32 [30515] _dl_find_object incorrectly returns 1 during early startup [30785] Always call destructors in reverse constructor order + [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with + -D_FILE_OFFSET_BITS=64 Version 2.35 diff --git a/io/Makefile b/io/Makefile index fb363c612c..b896484320 100644 --- 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 index 0000000000..f2a909fb02 --- /dev/null +++ b/io/tst-fcntl-lock-lfs.c @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h index 49c8fac0fb..0ca6e69ee9 100644 --- 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