[PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6]

Move common FS-specific ioctls from linux/ext2_fs.h to linux/fs.h as FS_IOC_*
and FS_IOC32_* and have the users of them use those as a base.

Also move the GETFLAGS/SETFLAGS flags to linux/fs.h as FS_*_FL macros, and then
have the other users use them as a base.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 16 insertions, 4 deletions

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index cc08f56750da..a7a01ff44669 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -216,14 +216,14 @@ struct ext3_new_group_data {
 /*
  * ioctl commands
  */
-#define EXT3_IOC_GETFLAGS               _IOR('f', 1, long)
-#define EXT3_IOC_SETFLAGS               _IOW('f', 2, long)
+#define EXT3_IOC_GETFLAGS               FS_IOC_GETFLAGS
+#define EXT3_IOC_SETFLAGS               FS_IOC_SETFLAGS
 #define EXT3_IOC_GETVERSION             _IOR('f', 3, long)
 #define EXT3_IOC_SETVERSION             _IOW('f', 4, long)
 #define EXT3_IOC_GROUP_EXTEND           _IOW('f', 7, unsigned long)
 #define EXT3_IOC_GROUP_ADD              _IOW('f', 8,struct ext3_new_group_input)
-#define EXT3_IOC_GETVERSION_OLD         _IOR('v', 1, long)
-#define EXT3_IOC_SETVERSION_OLD         _IOW('v', 2, long)
+#define EXT3_IOC_GETVERSION_OLD         FS_IOC_GETVERSION
+#define EXT3_IOC_SETVERSION_OLD         FS_IOC_SETVERSION
 #ifdef CONFIG_JBD_DEBUG
 #define EXT3_IOC_WAIT_FOR_READONLY      _IOR('f', 99, long)
 #endif
@@ -231,6 +231,18 @@ struct ext3_new_group_data {
 #define EXT3_IOC_SETRSVSZ               _IOW('f', 6, long)
 
 /*
+ * ioctl commands in 32 bit emulation
+ */
+#define EXT3_IOC32_GETVERSION           _IOR('f', 3, int)
+#define EXT3_IOC32_SETVERSION           _IOW('f', 4, int)
+#define EXT3_IOC32_GETRSVSZ             _IOR('f', 5, int)
+#define EXT3_IOC32_SETRSVSZ             _IOW('f', 6, int)
+#define EXT3_IOC32_GROUP_EXTEND         _IOW('f', 7, unsigned int)
+#ifdef CONFIG_JBD_DEBUG
+#define EXT3_IOC32_WAIT_FOR_READONLY    _IOR('f', 99, int)
+#endif
+
+/*
  *  Mount options
  */
 struct ext3_mount_options {