[PATCH 0/3] Small changes in headers

[PATCH 0/3] Small changes in headers

[Gabriel Laskar]

Here is some changes for ioctls numbers declared outside of uapi, or not used
at all.


Gabriel Laskar (3):
  mce: change asm/ioctls.h for linux/ioctl.h
  msm: remove unused header
  falloc: expose ioctl numbers into uapi

 arch/x86/include/uapi/asm/mce.h |  2 +-
 include/linux/falloc.h          | 18 ----------
 include/linux/msm_mdp.h         | 79 -----------------------------------------
 include/uapi/linux/falloc.h     | 18 ++++++++++
 4 files changed, 19 insertions(+), 98 deletions(-)
 delete mode 100644 include/linux/msm_mdp.h

-- 
2.6.0

[PATCH 1/3] mce: change asm/ioctls.h for linux/ioctl.h

[Gabriel Laskar]

Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---

asm/ioctls.h contains definition for termios, not just the _IO* macros

 arch/x86/include/uapi/asm/mce.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/uapi/asm/mce.h b/arch/x86/include/uapi/asm/mce.h
index 76880ed..03429da 100644
--- a/arch/x86/include/uapi/asm/mce.h
+++ b/arch/x86/include/uapi/asm/mce.h
@@ -2,7 +2,7 @@
 #define _UAPI_ASM_X86_MCE_H
 
 #include <linux/types.h>
-#include <asm/ioctls.h>
+#include <linux/ioctl.h>
 
 /* Fields are zero when not available */
 struct mce {
-- 
2.6.0

[PATCH 2/3] msm: remove unused header

[Gabriel Laskar]

Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---
 include/linux/msm_mdp.h | 79 -------------------------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 include/linux/msm_mdp.h

diff --git a/include/linux/msm_mdp.h b/include/linux/msm_mdp.h
deleted file mode 100644
index fe722c1..0000000
--- a/include/linux/msm_mdp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* include/linux/msm_mdp.h
- *
- * Copyright (C) 2007 Google Incorporated
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#ifndef _MSM_MDP_H_
-#define _MSM_MDP_H_
-
-#include <linux/types.h>
-
-#define MSMFB_IOCTL_MAGIC 'm'
-#define MSMFB_GRP_DISP          _IOW(MSMFB_IOCTL_MAGIC, 1, unsigned int)
-#define MSMFB_BLIT              _IOW(MSMFB_IOCTL_MAGIC, 2, unsigned int)
-
-enum {
-	MDP_RGB_565,		/* RGB 565 planar */
-	MDP_XRGB_8888,		/* RGB 888 padded */
-	MDP_Y_CBCR_H2V2,	/* Y and CbCr, pseudo planar w/ Cb is in MSB */
-	MDP_ARGB_8888,		/* ARGB 888 */
-	MDP_RGB_888,		/* RGB 888 planar */
-	MDP_Y_CRCB_H2V2,	/* Y and CrCb, pseudo planar w/ Cr is in MSB */
-	MDP_YCRYCB_H2V1,	/* YCrYCb interleave */
-	MDP_Y_CRCB_H2V1,	/* Y and CrCb, pseduo planar w/ Cr is in MSB */
-	MDP_Y_CBCR_H2V1,	/* Y and CrCb, pseduo planar w/ Cr is in MSB */
-	MDP_RGBA_8888,		/* ARGB 888 */
-	MDP_BGRA_8888,		/* ABGR 888 */
-	MDP_RGBX_8888,		/* RGBX 888 */
-	MDP_IMGTYPE_LIMIT	/* Non valid image type after this enum */
-};
-
-enum {
-	PMEM_IMG,
-	FB_IMG,
-};
-
-/* flag values */
-#define MDP_ROT_NOP	0
-#define MDP_FLIP_LR	0x1
-#define MDP_FLIP_UD	0x2
-#define MDP_ROT_90	0x4
-#define MDP_ROT_180	(MDP_FLIP_UD|MDP_FLIP_LR)
-#define MDP_ROT_270	(MDP_ROT_90|MDP_FLIP_UD|MDP_FLIP_LR)
-#define MDP_DITHER	0x8
-#define MDP_BLUR	0x10
-
-#define MDP_TRANSP_NOP	0xffffffff
-#define MDP_ALPHA_NOP	0xff
-
-struct mdp_rect {
-	u32 x, y, w, h;
-};
-
-struct mdp_img {
-	u32 width, height, format, offset;
-	int memory_id;		/* the file descriptor */
-};
-
-struct mdp_blit_req {
-	struct mdp_img src;
-	struct mdp_img dst;
-	struct mdp_rect src_rect;
-	struct mdp_rect dst_rect;
-	u32 alpha, transp_mask, flags;
-};
-
-struct mdp_blit_req_list {
-	u32 count;
-	struct mdp_blit_req req[];
-};
-
-#endif /* _MSM_MDP_H_ */
-- 
2.6.0

[PATCH 3/3] falloc: expose ioctl numbers into uapi

[Gabriel Laskar]

Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---
 include/linux/falloc.h      | 18 ------------------
 include/uapi/linux/falloc.h | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 9961110..eb651e9 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -3,24 +3,6 @@
 
 #include <uapi/linux/falloc.h>
 
-
-/*
- * Space reservation ioctls and argument structure
- * are designed to be compatible with the legacy XFS ioctls.
- */
-struct space_resv {
-	__s16		l_type;
-	__s16		l_whence;
-	__s64		l_start;
-	__s64		l_len;		/* len == 0 means until end of file */
-	__s32		l_sysid;
-	__u32		l_pid;
-	__s32		l_pad[4];	/* reserved area */
-};
-
-#define FS_IOC_RESVSP		_IOW('X', 40, struct space_resv)
-#define FS_IOC_RESVSP64		_IOW('X', 42, struct space_resv)
-
 #define	FALLOC_FL_SUPPORTED_MASK	(FALLOC_FL_KEEP_SIZE |		\
 					 FALLOC_FL_PUNCH_HOLE |		\
 					 FALLOC_FL_COLLAPSE_RANGE |	\
diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h
index 3e445a7..99cd0ea 100644
--- a/include/uapi/linux/falloc.h
+++ b/include/uapi/linux/falloc.h
@@ -58,4 +58,22 @@
  */
 #define FALLOC_FL_INSERT_RANGE		0x20
 
+
+/*
+ * Space reservation ioctls and argument structure
+ * are designed to be compatible with the legacy XFS ioctls.
+ */
+struct space_resv {
+	__s16		l_type;
+	__s16		l_whence;
+	__s64		l_start;
+	__s64		l_len;		/* len == 0 means until end of file */
+	__s32		l_sysid;
+	__u32		l_pid;
+	__s32		l_pad[4];	/* reserved area */
+};
+
+#define FS_IOC_RESVSP		_IOW('X', 40, struct space_resv)
+#define FS_IOC_RESVSP64		_IOW('X', 42, struct space_resv)
+
 #endif /* _UAPI_FALLOC_H_ */
-- 
2.6.0

Re: [PATCH 2/3] msm: remove unused header

[Arnd Bergmann]

On Monday 05 October 2015 16:50:10 Gabriel Laskar wrote:
> Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
> ---
>  include/linux/msm_mdp.h | 79 -------------------------------------------------
>  1 file changed, 79 deletions(-)
>  delete mode 100644 include/linux/msm_mdp.h

Good catch!

Acked-by: Arnd Bergmann <arnd@arndb.de>

Re: [PATCH 3/3] falloc: expose ioctl numbers into uapi

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

Hi Gabriel,

[auto build test WARNING on v4.3-rc4 -- if it's inappropriate base, please ignore]

config: x86_64-allnoconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

>> ./usr/include/linux/falloc.h:67: found __[us]{8,16,32,64} type without #include <linux/types.h>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 6030 bytes --]

[PATCH v2] falloc: expose ioctl numbers into uapi

[Gabriel Laskar]

Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---
 include/linux/falloc.h      | 18 ------------------
 include/uapi/linux/falloc.h | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 9961110..eb651e9 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -3,24 +3,6 @@
 
 #include <uapi/linux/falloc.h>
 
-
-/*
- * Space reservation ioctls and argument structure
- * are designed to be compatible with the legacy XFS ioctls.
- */
-struct space_resv {
-	__s16		l_type;
-	__s16		l_whence;
-	__s64		l_start;
-	__s64		l_len;		/* len == 0 means until end of file */
-	__s32		l_sysid;
-	__u32		l_pid;
-	__s32		l_pad[4];	/* reserved area */
-};
-
-#define FS_IOC_RESVSP		_IOW('X', 40, struct space_resv)
-#define FS_IOC_RESVSP64		_IOW('X', 42, struct space_resv)
-
 #define	FALLOC_FL_SUPPORTED_MASK	(FALLOC_FL_KEEP_SIZE |		\
 					 FALLOC_FL_PUNCH_HOLE |		\
 					 FALLOC_FL_COLLAPSE_RANGE |	\
diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h
index 3e445a7..28abee4 100644
--- a/include/uapi/linux/falloc.h
+++ b/include/uapi/linux/falloc.h
@@ -1,6 +1,8 @@
 #ifndef _UAPI_FALLOC_H_
 #define _UAPI_FALLOC_H_
 
+#include <linux/types.h>
+
 #define FALLOC_FL_KEEP_SIZE	0x01 /* default is extend size */
 #define FALLOC_FL_PUNCH_HOLE	0x02 /* de-allocates range */
 #define FALLOC_FL_NO_HIDE_STALE	0x04 /* reserved codepoint */
@@ -58,4 +60,22 @@
  */
 #define FALLOC_FL_INSERT_RANGE		0x20
 
+
+/*
+ * Space reservation ioctls and argument structure
+ * are designed to be compatible with the legacy XFS ioctls.
+ */
+struct space_resv {
+	__s16		l_type;
+	__s16		l_whence;
+	__s64		l_start;
+	__s64		l_len;		/* len == 0 means until end of file */
+	__s32		l_sysid;
+	__u32		l_pid;
+	__s32		l_pad[4];	/* reserved area */
+};
+
+#define FS_IOC_RESVSP		_IOW('X', 40, struct space_resv)
+#define FS_IOC_RESVSP64		_IOW('X', 42, struct space_resv)
+
 #endif /* _UAPI_FALLOC_H_ */
-- 
2.6.0

Re: [PATCH v2] falloc: expose ioctl numbers into uapi

[Arnd Bergmann]

On Monday 05 October 2015 20:44:30 Gabriel Laskar wrote:
> Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
> 

Did you see my 'Acked-by' reply? When you a reply like that,
you should normally add that tag below your 'Signed-off-by'
so it doesn't get lost.

Other than that, I think you should write a changelog text above
about how you discovered it and why it should be done like this.

	Arnd

Re: [PATCH v2] falloc: expose ioctl numbers into uapi

[Gabriel Laskar]

On Tue, 06 Oct 2015 10:40:04 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> On Monday 05 October 2015 20:44:30 Gabriel Laskar wrote:
> > Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
> > 
> 
> Did you see my 'Acked-by' reply? When you a reply like that,
> you should normally add that tag below your 'Signed-off-by'
> so it doesn't get lost.
> 
> Other than that, I think you should write a changelog text above
> about how you discovered it and why it should be done like this.

I am sorry, my answer was misplaced (wrong reply-to), I will resend a
new version of all the patchset with complete changelog. I am just
waiting for a ack/nack on the mce one.


-- 
Gabriel Laskar

Re: [PATCH 1/3] mce: change asm/ioctls.h for linux/ioctl.h

[Arnd Bergmann]

On Monday 05 October 2015 16:50:09 Gabriel Laskar wrote:
> Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
> ---
> 
> asm/ioctls.h contains definition for termios, not just the _IO* macros
> 
> 

The patch looks reasonable, but the description you have below the ---
should be the actual changelog that is missing.

Also, please show how you found this, did it trigger some checking tool,
or did you find it through manual inspection?

With that fixed,

Acked-by: Arnd Bergmann <arnd@arndb.de>