Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1239841

[PATCH v2] falloc: expose ioctl numbers into uapi

Show all headers | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] msm: remove unused header Gabriel Laskar <gabriel@lse.epita.fr> - 2015-10-05 17:00 +0200
  [PATCH v2] falloc: expose ioctl numbers into uapi Gabriel Laskar <gabriel@lse.epita.fr> - 2015-10-05 20:50 +0200
    Re: [PATCH v2] falloc: expose ioctl numbers into uapi Arnd Bergmann <arnd@arndb.de> - 2015-10-06 10:50 +0200
      Re: [PATCH v2] falloc: expose ioctl numbers into uapi Gabriel Laskar <gabriel@lse.epita.fr> - 2015-10-06 14:40 +0200

csiph-web