On Sun, 2016-07-10 at 17:07 +0900, Tomohiro Kusumi wrote:
> 607ca46e which introduced uapi to Linux kernel added "_UAPI" to
> include/uapi/linux/auto_fs.h, but not to include/uapi/linux/auto_fs4.h.
>
> Headers under include/linux which only include uapi headers
> generally have different names for include guard without "_UAPI",
> so follow that.
Yeah, and my series to rename autofs4 to autofs fixes this (if I can ever get to
posting it, it's been a long time), along with moving auto_dev-ioctl.h to
uapi/linux, where it should be.
Also it merges auto_fs4.h and auto_fs.h, leaving a stub for auto_fs4.h for
backward compatibility.
>
> Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@xxxxxxxxx>
> ---
> include/uapi/linux/auto_fs4.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h
> index 8f8f1bd..3c7ed14 100644
> --- a/include/uapi/linux/auto_fs4.h
> +++ b/include/uapi/linux/auto_fs4.h
> @@ -6,8 +6,8 @@
> * option, any later version, incorporated herein by reference.
> */
>
> -#ifndef _LINUX_AUTO_FS4_H
> -#define _LINUX_AUTO_FS4_H
> +#ifndef _UAPI_LINUX_AUTO_FS4_H
> +#define _UAPI_LINUX_AUTO_FS4_H
>
> /* Include common v3 definitions */
> #include <linux/types.h>
> @@ -154,4 +154,4 @@ union autofs_v5_packet_union {
> #define AUTOFS_IOC_PROTOSUBVER _IOR(0x93, 0x67, int)
> #define AUTOFS_IOC_ASKUMOUNT _IOR(0x93, 0x70, int)
>
> -#endif /* _LINUX_AUTO_FS4_H */
> +#endif /* _UAPI_LINUX_AUTO_FS4_H */
--
To unsubscribe from this list: send the line "unsubscribe autofs" in
