On Sun, Aug 6, 2017 at 6:44 PM, Mikko Rapeli <mikko.rapeli@xxxxxx> wrote:
> Fixes userspace compilation errors about unknown pid_t, u_short etc types.
>
> Signed-off-by: Mikko Rapeli <mikko.rapeli@xxxxxx>
> Cc: Jan Harkes <jaharkes@xxxxxxxxxx>
> Cc: codalist@xxxxxxxxxxxxxxx
> ---
> include/uapi/linux/coda.h | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h
> index 695fade33c64..2985ca00d63b 100644
> --- a/include/uapi/linux/coda.h
> +++ b/include/uapi/linux/coda.h
> @@ -100,7 +100,14 @@ typedef unsigned long long u_quad_t;
> #if defined(__linux__)
> #include <linux/time.h>
> #define cdev_t u_quad_t
> +
> #ifndef __KERNEL__
> +typedef unsigned long u_long;
> +typedef unsigned int u_int;
> +typedef unsigned short u_short;
> +typedef u_long ino_t;
> +typedef u_long dev_t;
> +typedef void *caddr_t;
This looks suspicious: obviously anyone who is including this
header today has to define those types somewhere. If you add
another definition, that will clash with the existing one.
Have you tried replacing the custom types with the regular
kernel types instead?
I would not worry about breaking other operating systems here,
in fact it may be better to remove the #ifdef for those altogether.
> #if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
> #define _UQUAD_T_ 1
> typedef unsigned long long u_quad_t;
> @@ -295,8 +302,8 @@ struct coda_statfs {
> struct coda_in_hdr {
> u_int32_t opcode;
> u_int32_t unique; /* Keep multiple outstanding msgs distinct */
> - pid_t pid;
> - pid_t pgid;
> + __kernel_pid_t pid;
> + __kernel_pid_t pgid;
> vuid_t uid;
> };
This looks like an actual bugfix: pid_t might differ between libc and
the kernel, so the kernel interface has to use types that the kernel
defines. This is probably ok on any supported version of glibc,
so it's unlikely to have caused runtime problems, but it should be
fixed nonetheless.
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-api" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
