mirror of
https://sourceware.org/git/glibc.git
synced 2025-06-05 00:22:17 +03:00
434bf72a94
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>
69 lines
2.3 KiB
C
69 lines
2.3 KiB
C
/* O_*, F_*, FD_* bit values for Linux/PowerPC.
|
|
Copyright (C) 1995-2023 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _FCNTL_H
|
|
# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
|
|
#endif
|
|
|
|
#include <bits/wordsize.h>
|
|
|
|
#define __O_DIRECTORY 040000 /* Must be a directory. */
|
|
#define __O_NOFOLLOW 0100000 /* Do not follow links. */
|
|
#define __O_DIRECT 0400000 /* Direct disk access. */
|
|
|
|
#if __WORDSIZE == 64
|
|
/* Not necessary, files are always with 64bit off_t. */
|
|
# define __O_LARGEFILE 0
|
|
#else
|
|
# define __O_LARGEFILE 0200000
|
|
#endif
|
|
|
|
#if __WORDSIZE == 64 && !defined __USE_FILE_OFFSET64
|
|
# define F_GETLK 5
|
|
# define F_SETLK 6
|
|
# define F_SETLKW 7
|
|
#endif
|
|
|
|
struct flock
|
|
{
|
|
short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
|
|
short int l_whence; /* Where `l_start' is relative to (like `lseek'). */
|
|
#ifndef __USE_FILE_OFFSET64
|
|
__off_t l_start; /* Offset where the lock begins. */
|
|
__off_t l_len; /* Size of the locked area; zero means until EOF. */
|
|
#else
|
|
__off64_t l_start; /* Offset where the lock begins. */
|
|
__off64_t l_len; /* Size of the locked area; zero means until EOF. */
|
|
#endif
|
|
__pid_t l_pid; /* Process holding the lock. */
|
|
};
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
struct flock64
|
|
{
|
|
short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
|
|
short int l_whence; /* Where `l_start' is relative to (like `lseek'). */
|
|
__off64_t l_start; /* Offset where the lock begins. */
|
|
__off64_t l_len; /* Size of the locked area; zero means until EOF. */
|
|
__pid_t l_pid; /* Process holding the lock. */
|
|
};
|
|
#endif
|
|
|
|
/* Include generic Linux declarations. */
|
|
#include <bits/fcntl-linux.h>
|