From: Laurent Vivier <laurent@vivier.eu>
To: Michael Forney <mforney@mforney.org>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org
Subject: Re: [PATCH v2] linux-user: Remove obsolete F_SHLCK and F_EXLCK translation
Date: Mon, 18 Jan 2021 16:32:51 +0100 [thread overview]
Message-ID: <ab02f165-21ae-1d6f-ebf6-c9a32b4ec424@vivier.eu> (raw)
In-Reply-To: <20210114223602.9004-1-mforney@mforney.org>
Le 14/01/2021 à 23:36, Michael Forney a écrit :
> 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>
> ---
> Changes since v1: fixed typo in commit message, resend to qemu-trivial.
>
> linux-user/alpha/target_fcntl.h | 2 --
> linux-user/generic/fcntl.h | 5 -----
> linux-user/syscall.c | 2 --
> 3 files changed, 9 deletions(-)
>
> diff --git a/linux-user/alpha/target_fcntl.h b/linux-user/alpha/target_fcntl.h
> index 2617e73472..e16ed1d415 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 c85c5b9fed..4568d1f42b 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 d182890ff0..f238edf715 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -6664,8 +6664,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)
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
next prev parent reply other threads:[~2021-01-18 15:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 3:27 [PATCH] linux-user: Remove obsolete F_SHLCK and F_WRLCK translation Michael Forney
2021-01-14 22:36 ` [PATCH v2] linux-user: Remove obsolete F_SHLCK and F_EXLCK translation Michael Forney
2021-01-18 15:32 ` Laurent Vivier [this message]
2021-01-18 17:33 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab02f165-21ae-1d6f-ebf6-c9a32b4ec424@vivier.eu \
--to=laurent@vivier.eu \
--cc=mforney@mforney.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).