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

diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index b0ea6687ab55..e34c7db00f6f 100644
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -22,7 +22,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
 #include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
@@ -74,7 +73,7 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
                         }
                         break;
 #ifdef CONFIG_CIFS_POSIX
-                case EXT2_IOC_GETFLAGS:
+                case FS_IOC_GETFLAGS:
                         if(CIFS_UNIX_EXTATTR_CAP & caps) {
                                 if (pSMBFile == NULL)
                                         break;
@@ -82,12 +81,12 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
                                         &ExtAttrBits, &ExtAttrMask);
                                 if(rc == 0)
                                         rc = put_user(ExtAttrBits &
-                                                EXT2_FL_USER_VISIBLE,
+                                                FS_FL_USER_VISIBLE,
                                                 (int __user *)arg);
                         }
                         break;
 
-                case EXT2_IOC_SETFLAGS:
+                case FS_IOC_SETFLAGS:
                         if(CIFS_UNIX_EXTATTR_CAP & caps) {
                                 if(get_user(ExtAttrBits,(int __user *)arg)) {
                                         rc = -EFAULT;