[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, 7 insertions, 8 deletions

diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
index 67b3774820eb..37db52488262 100644
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
 #include <linux/ctype.h>
 #include <linux/capability.h>
 #include <linux/time.h>
@@ -22,13 +21,13 @@ static struct {
         long jfs_flag;
         long ext2_flag;
 } jfs_map[] = {
-        {JFS_NOATIME_FL, EXT2_NOATIME_FL},
-        {JFS_DIRSYNC_FL, EXT2_DIRSYNC_FL},
-        {JFS_SYNC_FL, EXT2_SYNC_FL},
-        {JFS_SECRM_FL, EXT2_SECRM_FL},
-        {JFS_UNRM_FL, EXT2_UNRM_FL},
-        {JFS_APPEND_FL, EXT2_APPEND_FL},
-        {JFS_IMMUTABLE_FL, EXT2_IMMUTABLE_FL},
+        {JFS_NOATIME_FL,        FS_NOATIME_FL},
+        {JFS_DIRSYNC_FL,        FS_DIRSYNC_FL},
+        {JFS_SYNC_FL,           FS_SYNC_FL},
+        {JFS_SECRM_FL,          FS_SECRM_FL},
+        {JFS_UNRM_FL,           FS_UNRM_FL},
+        {JFS_APPEND_FL,         FS_APPEND_FL},
+        {JFS_IMMUTABLE_FL,      FS_IMMUTABLE_FL},
         {0, 0},
 };