diff options
| author | Michael Forney <mforney@mforney.org> | 2021-01-14 14:36:02 -0800 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-01-21 13:27:34 +0100 |
| commit | b1d2e476e94cb215d9e19fef1049d413b414ffc2 (patch) | |
| tree | 6c4e10cf23bb7861a6f63a65210faf2c7b9f3c77 /linux-user | |
| parent | 38987eabb18ad6ba2ef71b19b43d7c869c58f4bb (diff) | |
| download | qemu-b1d2e476e94cb215d9e19fef1049d413b414ffc2.zip qemu-b1d2e476e94cb215d9e19fef1049d413b414ffc2.tar.gz qemu-b1d2e476e94cb215d9e19fef1049d413b414ffc2.tar.bz2 | |
linux-user: Remove obsolete F_SHLCK and F_EXLCK translation
These lock types are unsupported by Linux since v2.2[0][1] and
always return EINVAL (except on SPARC up until v2.6, which just
warned).
musl libc does not define these constants, so just remove them from
the translation cases.
[0] https://github.com/mpe/linux-fullhistory/blob/v2.2.0/fs/locks.c#L322-L324
[1] https://github.com/mpe/linux-fullhistory/blob/v2.2.0/fs/locks.c#L429-L445
Signed-off-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210114223602.9004-1-mforney@mforney.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/alpha/target_fcntl.h | 2 | ||||
| -rw-r--r-- | linux-user/generic/fcntl.h | 5 | ||||
| -rw-r--r-- | linux-user/syscall.c | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/linux-user/alpha/target_fcntl.h b/linux-user/alpha/target_fcntl.h index 2617e73..e16ed1d 100644 --- a/linux-user/alpha/target_fcntl.h +++ b/linux-user/alpha/target_fcntl.h @@ -33,8 +33,6 @@ #define TARGET_F_RDLCK 1 #define TARGET_F_WRLCK 2 #define TARGET_F_UNLCK 8 -#define TARGET_F_EXLCK 16 -#define TARGET_F_SHLCK 32 #include "../generic/fcntl.h" #endif diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h index c85c5b9..4568d1f 100644 --- a/linux-user/generic/fcntl.h +++ b/linux-user/generic/fcntl.h @@ -119,11 +119,6 @@ struct target_f_owner_ex { #define TARGET_F_UNLCK 2 #endif -#ifndef TARGET_F_EXLCK -#define TARGET_F_EXLCK 4 -#define TARGET_F_SHLCK 8 -#endif - #ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK #ifndef TARGET_ARCH_FLOCK_PAD #define TARGET_ARCH_FLOCK_PAD diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5d482dc..3476077 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6679,8 +6679,6 @@ static int target_to_host_fcntl_cmd(int cmd) TRANSTBL_CONVERT(F_RDLCK); \ TRANSTBL_CONVERT(F_WRLCK); \ TRANSTBL_CONVERT(F_UNLCK); \ - TRANSTBL_CONVERT(F_EXLCK); \ - TRANSTBL_CONVERT(F_SHLCK); \ } static int target_to_host_flock(int type) |