[PATCH] fscrypt: include <linux/ioctl.h> in UAPI header

[PATCH] fscrypt: include <linux/ioctl.h> in UAPI header

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

<linux/fscrypt.h> defines ioctl numbers using the macros like _IORW()
which are defined in <linux/ioctl.h>, so <linux/ioctl.h> should be
included as a prerequisite, like it is in many other kernel headers.

In practice this doesn't really matter since anyone referencing these
ioctl numbers will almost certainly include <sys/ioctl.h> too in order
to actually call ioctl().  But we might as well fix this.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 include/uapi/linux/fscrypt.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h
index d5112a24e8b9f..0d8a6f47711c3 100644
--- a/include/uapi/linux/fscrypt.h
+++ b/include/uapi/linux/fscrypt.h
@@ -8,6 +8,7 @@
 #ifndef _UAPI_LINUX_FSCRYPT_H
 #define _UAPI_LINUX_FSCRYPT_H
 
+#include <linux/ioctl.h>
 #include <linux/types.h>
 
 /* Encryption policy flags */
-- 
2.24.1.735.g03f4e72817-goog

Re: [PATCH] fscrypt: include <linux/ioctl.h> in UAPI header

[Eric Biggers]

On Thu, Dec 19, 2019 at 10:56:24AM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> <linux/fscrypt.h> defines ioctl numbers using the macros like _IORW()
> which are defined in <linux/ioctl.h>, so <linux/ioctl.h> should be
> included as a prerequisite, like it is in many other kernel headers.
> 
> In practice this doesn't really matter since anyone referencing these
> ioctl numbers will almost certainly include <sys/ioctl.h> too in order
> to actually call ioctl().  But we might as well fix this.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  include/uapi/linux/fscrypt.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h
> index d5112a24e8b9f..0d8a6f47711c3 100644
> --- a/include/uapi/linux/fscrypt.h
> +++ b/include/uapi/linux/fscrypt.h
> @@ -8,6 +8,7 @@
>  #ifndef _UAPI_LINUX_FSCRYPT_H
>  #define _UAPI_LINUX_FSCRYPT_H
>  
> +#include <linux/ioctl.h>
>  #include <linux/types.h>
>  
>  /* Encryption policy flags */
> -- 
> 2.24.1.735.g03f4e72817-goog
> 

Applied to fscrypt.git#master for 5.6.

(Fixed a typo in the commit message -- "_IORW()" should be "_IOWR()".)

- Eric