linux-api.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 3/3] falloc: expose ioctl numbers into uapi
       [not found] ` <1444141657-14898-1-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
@ 2015-10-06 14:27   ` Gabriel Laskar
  2015-10-06 14:43     ` Yann Droneaud
       [not found]     ` <1444141657-14898-4-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
  0 siblings, 2 replies; 3+ messages in thread
From: Gabriel Laskar @ 2015-10-06 14:27 UTC (permalink / raw)
  To: Dave Chinner, Ashish Sangwan, Namjae Jeon, Gabriel Laskar,
	open list, open list:ABI/API
  Cc: Greg Kroah-Hartman

Signed-off-by: Gabriel Laskar <gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
---

v2: missed the include of <linux/types.h>

 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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2 3/3] falloc: expose ioctl numbers into uapi
  2015-10-06 14:27   ` [PATCH v2 3/3] falloc: expose ioctl numbers into uapi Gabriel Laskar
@ 2015-10-06 14:43     ` Yann Droneaud
       [not found]     ` <1444141657-14898-4-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
  1 sibling, 0 replies; 3+ messages in thread
From: Yann Droneaud @ 2015-10-06 14:43 UTC (permalink / raw)
  To: Gabriel Laskar, Dave Chinner, Ashish Sangwan, Namjae Jeon,
	linux-kernel, linux-api
  Cc: Greg Kroah-Hartman

Hi,

Le mardi 06 octobre 2015 à 16:27 +0200, Gabriel Laskar a écrit :
> Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
> ---
> 
> v2: missed the include of <linux/types.h>
> 
>  include/linux/falloc.h      | 18 ------------------
>  include/uapi/linux/falloc.h | 20 ++++++++++++++++++++
>  2 files changed, 20 insertions(+), 18 deletions(-)
> 
> 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>
> +

You should also add #include <linux/ioctl.h> for _IOW() macro

>  #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_ */


Regards.

-- 
Yann Droneaud
OPTEYA

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v3] falloc: expose ioctl numbers into uapi
       [not found]     ` <1444141657-14898-4-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
@ 2015-10-06 16:21       ` Gabriel Laskar
  0 siblings, 0 replies; 3+ messages in thread
From: Gabriel Laskar @ 2015-10-06 16:21 UTC (permalink / raw)
  To: Dave Chinner, Gabriel Laskar, Namjae Jeon, Ashish Sangwan,
	open list, open list:ABI/API

Signed-off-by: Gabriel Laskar <gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
---

It seems that I am a bit off today, here is hopefully the last version

v2: missed <linux/types.h>
v3: missed <linux/ioctl.h>

 include/linux/falloc.h      | 18 ------------------
 include/uapi/linux/falloc.h | 21 +++++++++++++++++++++
 2 files changed, 21 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..0ae27fe 100644
--- a/include/uapi/linux/falloc.h
+++ b/include/uapi/linux/falloc.h
@@ -1,6 +1,9 @@
 #ifndef _UAPI_FALLOC_H_
 #define _UAPI_FALLOC_H_
 
+#include <linux/ioctl.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 +61,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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-10-06 16:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1444141657-14898-1-git-send-email-gabriel@lse.epita.fr>
     [not found] ` <1444141657-14898-1-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
2015-10-06 14:27   ` [PATCH v2 3/3] falloc: expose ioctl numbers into uapi Gabriel Laskar
2015-10-06 14:43     ` Yann Droneaud
     [not found]     ` <1444141657-14898-4-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
2015-10-06 16:21       ` [PATCH v3] " Gabriel Laskar

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).