From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id 9B0EB3858D1E for ; Fri, 8 Sep 2023 05:28:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B0EB3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Content-Type:From:Reply-To:Subject:Content-ID: Content-Description:In-Reply-To:References:X-Debbugs-Cc; bh=+rMfAvfpLJ0CpU3Hh/NIlpAvqUrYzIiY78TXq+D7nPs=; b=UUUqoY5i29h9JBDpl5zJti4zrU +srNzlOKrrvHfTEpUDhMjdlOynY6+7B4OAotWS0jCWZGboqo2jeWFYf4aqyeWMcWFJZ4ccEsskceY CYNPGrb1XSablDdEuV1hLTjuiPWjGOJY6WukaZUFyvEuUd/K1MOE/Bd/pYJonEy+27JWJ6mVH70zn PoyqXS5bB7+dvKsHfmJDngOPEOqzowJ73dlbmgIZaF5n/YS/Erpb/UG5AKcR3xsTU88RaW/9LFEB5 +y3ZYQ0RUeVuThL/vyne36JMNCOhhXSaQvCUzMyC+lESTDcFIeSeALhYNss2xJU6uFRw+VmJvSCai Y8eriFSw==; Received: from [2a01:e34:ec5d:a741:1ee1:92ff:feb4:5ec0] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qeU2d-00GgD7-Gz; Fri, 08 Sep 2023 07:28:27 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.96) (envelope-from ) id 1qeU2d-00CuLx-0S; Fri, 08 Sep 2023 07:28:27 +0200 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Aurelien Jarno , Adhemerval Zanella Subject: [COMMITTED 2.37] io: Fix record locking contants for powerpc64 with __USE_FILE_OFFSET64 Date: Fri, 8 Sep 2023 07:28:26 +0200 Message-Id: <20230908052826.3076490-1-aurelien@aurel32.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,SPF_HELO_PASS,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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) --- 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(-) create mode 100644 io/tst-fcntl-lock-lfs.c diff --git a/NEWS b/NEWS index 0ec70a1b97..e8a318e631 100644 --- 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 Version 2.36 diff --git a/io/Makefile b/io/Makefile index 587b057209..069e675188 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 f7615a447e..d8a291a331 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 -- 2.39.2