[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>

2 files changed, 10 insertions, 15 deletions

diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index 8a1ca5ef7ada..3915635b4470 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -246,12 +246,8 @@ struct hfsplus_readdir_data {
 
 /* ext2 ioctls (EXT2_IOC_GETFLAGS and EXT2_IOC_SETFLAGS) to support
  * chattr/lsattr */
-#define HFSPLUS_IOC_EXT2_GETFLAGS       _IOR('f', 1, long)
-#define HFSPLUS_IOC_EXT2_SETFLAGS       _IOW('f', 2, long)
-
-#define EXT2_FLAG_IMMUTABLE             0x00000010 /* Immutable file */
-#define EXT2_FLAG_APPEND                0x00000020 /* writes to file may only append */
-#define EXT2_FLAG_NODUMP                0x00000040 /* do not dump file */
+#define HFSPLUS_IOC_EXT2_GETFLAGS       FS_IOC_GETFLAGS
+#define HFSPLUS_IOC_EXT2_SETFLAGS       FS_IOC_SETFLAGS
 
 
 /*
diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
index 13cf848ac833..79fd10402ea3 100644
--- a/fs/hfsplus/ioctl.c
+++ b/fs/hfsplus/ioctl.c
@@ -28,11 +28,11 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
         case HFSPLUS_IOC_EXT2_GETFLAGS:
                 flags = 0;
                 if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_IMMUTABLE)
-                        flags |= EXT2_FLAG_IMMUTABLE; /* EXT2_IMMUTABLE_FL */
+                        flags |= FS_IMMUTABLE_FL; /* EXT2_IMMUTABLE_FL */
                 if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_APPEND)
-                        flags |= EXT2_FLAG_APPEND; /* EXT2_APPEND_FL */
+                        flags |= FS_APPEND_FL; /* EXT2_APPEND_FL */
                 if (HFSPLUS_I(inode).userflags & HFSPLUS_FLG_NODUMP)
-                        flags |= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */
+                        flags |= FS_NODUMP_FL; /* EXT2_NODUMP_FL */
                 return put_user(flags, (int __user *)arg);
         case HFSPLUS_IOC_EXT2_SETFLAGS: {
                 if (IS_RDONLY(inode))
@@ -44,32 +44,31 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                 if (get_user(flags, (int __user *)arg))
                         return -EFAULT;
 
-                if (flags & (EXT2_FLAG_IMMUTABLE|EXT2_FLAG_APPEND) ||
+                if (flags & (FS_IMMUTABLE_FL|FS_APPEND_FL) ||
                     HFSPLUS_I(inode).rootflags & (HFSPLUS_FLG_IMMUTABLE|HFSPLUS_FLG_APPEND)) {
                         if (!capable(CAP_LINUX_IMMUTABLE))
                                 return -EPERM;
                 }
 
                 /* don't silently ignore unsupported ext2 flags */
-                if (flags & ~(EXT2_FLAG_IMMUTABLE|EXT2_FLAG_APPEND|
-                              EXT2_FLAG_NODUMP))
+                if (flags & ~(FS_IMMUTABLE_FL|FS_APPEND_FL|FS_NODUMP_FL))
                         return -EOPNOTSUPP;
 
-                if (flags & EXT2_FLAG_IMMUTABLE) { /* EXT2_IMMUTABLE_FL */
+                if (flags & FS_IMMUTABLE_FL) { /* EXT2_IMMUTABLE_FL */
                         inode->i_flags |= S_IMMUTABLE;
                         HFSPLUS_I(inode).rootflags |= HFSPLUS_FLG_IMMUTABLE;
                 } else {
                         inode->i_flags &= ~S_IMMUTABLE;
                         HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_IMMUTABLE;
                 }
-                if (flags & EXT2_FLAG_APPEND) { /* EXT2_APPEND_FL */
+                if (flags & FS_APPEND_FL) { /* EXT2_APPEND_FL */
                         inode->i_flags |= S_APPEND;
                         HFSPLUS_I(inode).rootflags |= HFSPLUS_FLG_APPEND;
                 } else {
                         inode->i_flags &= ~S_APPEND;
                         HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_APPEND;
                 }
-                if (flags & EXT2_FLAG_NODUMP) /* EXT2_NODUMP_FL */
+                if (flags & FS_NODUMP_FL) /* EXT2_NODUMP_FL */
                         HFSPLUS_I(inode).userflags |= HFSPLUS_FLG_NODUMP;
                 else
                         HFSPLUS_I(inode).userflags &= ~HFSPLUS_FLG_NODUMP;