diff mbox series

[v2] io: Fix F_GETLK64, F_SETLK64, and F_SETLKW64 for powerpc64

Message ID 20230531113749.22479-1-adhemerval.zanella@linaro.org
State New
Headers show
Series [v2] io: Fix F_GETLK64, F_SETLK64, and F_SETLKW64 for powerpc64 | expand

Commit Message

Adhemerval Zanella Netto May 31, 2023, 11:37 a.m. UTC 
Different than other 64 bit architectures, powerpc64 defines the
LFS POSIX lock constants  with values similar to 32 ABI, which
are meant to be used with fcntl64 syscall.  Since powerpc64 kABI
does not have fcntl, the constants are adjusted with the
FCNTL_ADJUST_CMD macro.

The 4d0fe291aed3a476a changed the logic of generic constants
LFS value are equal to the default values; which is now wrong
for powerpc64.

Fix the value by explicit define the previous glibc constants
(powerpc64 does not need to use the 32 kABI value, but it simplifies
the FCNTL_ADJUST_CMD which should be kept as compatibility).

Checked on powerpc64-linux-gnu and powerpc-linux-gnu.
---
 sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Andreas Schwab May 31, 2023, 11:57 a.m. UTC | #1 
On Mai 31 2023, Adhemerval Zanella via Libc-alpha wrote:

> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
> index 0905cd833c..33fe09f218 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
> @@ -33,6 +33,16 @@
>  # define __O_LARGEFILE	0200000
>  #endif
>  
> +#if __WORDSIZE == 64
> +# define F_GETLK	5
> +# define F_SETLK	6
> +# define F_SETLKW	7
> +
> +# define F_GETLK64	12
> +# define F_SETLK64	13
> +# define F_SETLKW64	14

Do you actually need the latter three?  They are the same as the generic
definitions.  I think the subject is wrong, it's actually the
F_GETLK/F_SETLK/F_SETLKW constants that are wrong.
Adhemerval Zanella Netto May 31, 2023, 12:42 p.m. UTC | #2 
On 31/05/23 08:57, Andreas Schwab wrote:
> On Mai 31 2023, Adhemerval Zanella via Libc-alpha wrote:
> 
>> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
>> index 0905cd833c..33fe09f218 100644
>> --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
>> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
>> @@ -33,6 +33,16 @@
>>  # define __O_LARGEFILE	0200000
>>  #endif
>>  
>> +#if __WORDSIZE == 64
>> +# define F_GETLK	5
>> +# define F_SETLK	6
>> +# define F_SETLKW	7
>> +
>> +# define F_GETLK64	12
>> +# define F_SETLK64	13
>> +# define F_SETLKW64	14
> 
> Do you actually need the latter three?  They are the same as the generic
> definitions.

Indeed we do not need it, I will remove it.

  I think the subject is wrong, it's actually the
> F_GETLK/F_SETLK/F_SETLKW constants that are wrong.
> 

Hum, I used the largefile name because the generic code will use it to define
the F_GETLK/F_SETLK/F_SETLKW.
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index 0905cd833c..33fe09f218 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -33,6 +33,16 @@ 
 # define __O_LARGEFILE	0200000
 #endif
 
+#if __WORDSIZE == 64
+# define F_GETLK	5
+# define F_SETLK	6
+# define F_SETLKW	7
+
+# define F_GETLK64	12
+# define F_SETLK64	13
+# define F_SETLKW64	14
+#endif
+
 struct flock
   {
     short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.	*/