From: Gabriel Laskar <gabriel@lse.epita.fr>
To: Dave Chinner <dchinner@redhat.com>,
Gabriel Laskar <gabriel@lse.epita.fr>,
Namjae Jeon <namjae.jeon@samsung.com>,
Ashish Sangwan <a.sangwan@samsung.com>,
linux-kernel@vger.kernel.org (open list),
linux-api@vger.kernel.org (open list:ABI/API)
Subject: [PATCH v3] falloc: expose ioctl numbers into uapi
Date: Tue, 6 Oct 2015 18:21:15 +0200 [thread overview]
Message-ID: <1444148477-28441-1-git-send-email-gabriel@lse.epita.fr> (raw)
In-Reply-To: <1444141657-14898-4-git-send-email-gabriel@lse.epita.fr>
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---
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
prev parent reply other threads:[~2015-10-06 16:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1444141657-14898-1-git-send-email-gabriel@lse.epita.fr>
2015-10-06 14:27 ` [PATCH v2 1/3] mce: change asm/ioctls.h for linux/ioctl.h Gabriel Laskar
2015-10-12 14:30 ` [tip:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header tip-bot for Gabriel Laskar
2015-10-06 14:27 ` [PATCH v2 2/3] msm: remove unused header Gabriel Laskar
2015-10-06 14:27 ` [PATCH v2 3/3] falloc: expose ioctl numbers into uapi Gabriel Laskar
2015-10-06 14:43 ` Yann Droneaud
2015-10-06 16:21 ` Gabriel Laskar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444148477-28441-1-git-send-email-gabriel@lse.epita.fr \
--to=gabriel@lse.epita.fr \
--cc=a.sangwan@samsung.com \
--cc=dchinner@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namjae.jeon@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).