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

[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>
David Howells · Jens Axboe
1 parent 863d5b822c
Showing 9 changed files with 124 additions and 89 deletions Side-by-side Diff
fs/cifs/ioctl.c
fs/compat_ioctl.c
fs/hfsplus/hfsplus_fs.h
fs/hfsplus/ioctl.c
fs/jfs/ioctl.c
include/linux/ext2_fs.h
include/linux/ext3_fs.h
include/linux/fs.h
include/linux/reiserfs_fs.h
@@ -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 @@
 			}
 			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 @@
 					&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;
@@ -123,21 +123,6 @@
 #include <linux/dvb/video.h>
 #include <linux/lp.h>
  
-/* Aiee. Someone does not find a difference between int and long */
-#define EXT2_IOC32_GETFLAGS               _IOR('f', 1, int)
-#define EXT2_IOC32_SETFLAGS               _IOW('f', 2, int)
-#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
-
-#define EXT2_IOC32_GETVERSION             _IOR('v', 1, int)
-#define EXT2_IOC32_SETVERSION             _IOW('v', 2, int)
-
 static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,
 			      unsigned long arg, struct file *f)
 {
@@ -246,12 +246,8 @@
  
 /* 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
  
  
 /*
@@ -28,11 +28,11 @@
 	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 @@
 		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;
@@ -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 @@
 	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},
 };
  
@@ -165,41 +165,49 @@
 #define	EXT2_N_BLOCKS			(EXT2_TIND_BLOCK + 1)
  
 /*
- * Inode flags
+ * Inode flags (GETFLAGS/SETFLAGS)
  */
-#define	EXT2_SECRM_FL			0x00000001 /* Secure deletion */
-#define	EXT2_UNRM_FL			0x00000002 /* Undelete */
-#define	EXT2_COMPR_FL			0x00000004 /* Compress file */
-#define EXT2_SYNC_FL			0x00000008 /* Synchronous updates */
-#define EXT2_IMMUTABLE_FL		0x00000010 /* Immutable file */
-#define EXT2_APPEND_FL			0x00000020 /* writes to file may only append */
-#define EXT2_NODUMP_FL			0x00000040 /* do not dump file */
-#define EXT2_NOATIME_FL			0x00000080 /* do not update atime */
+#define	EXT2_SECRM_FL			FS_SECRM_FL	/* Secure deletion */
+#define	EXT2_UNRM_FL			FS_UNRM_FL	/* Undelete */
+#define	EXT2_COMPR_FL			FS_COMPR_FL	/* Compress file */
+#define EXT2_SYNC_FL			FS_SYNC_FL	/* Synchronous updates */
+#define EXT2_IMMUTABLE_FL		FS_IMMUTABLE_FL	/* Immutable file */
+#define EXT2_APPEND_FL			FS_APPEND_FL	/* writes to file may only append */
+#define EXT2_NODUMP_FL			FS_NODUMP_FL	/* do not dump file */
+#define EXT2_NOATIME_FL			FS_NOATIME_FL	/* do not update atime */
 /* Reserved for compression usage... */
-#define EXT2_DIRTY_FL			0x00000100
-#define EXT2_COMPRBLK_FL		0x00000200 /* One or more compressed clusters */
-#define EXT2_NOCOMP_FL			0x00000400 /* Don't compress */
-#define EXT2_ECOMPR_FL			0x00000800 /* Compression error */
+#define EXT2_DIRTY_FL			FS_DIRTY_FL
+#define EXT2_COMPRBLK_FL		FS_COMPRBLK_FL	/* One or more compressed clusters */
+#define EXT2_NOCOMP_FL			FS_NOCOMP_FL	/* Don't compress */
+#define EXT2_ECOMPR_FL			FS_ECOMPR_FL	/* Compression error */
 /* End compression flags --- maybe not all used */	
-#define EXT2_BTREE_FL			0x00001000 /* btree format dir */
-#define EXT2_INDEX_FL			0x00001000 /* hash-indexed directory */
-#define EXT2_IMAGIC_FL			0x00002000 /* AFS directory */
-#define EXT2_JOURNAL_DATA_FL		0x00004000 /* Reserved for ext3 */
-#define EXT2_NOTAIL_FL			0x00008000 /* file tail should not be merged */
-#define EXT2_DIRSYNC_FL			0x00010000 /* dirsync behaviour (directories only) */
-#define EXT2_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
-#define EXT2_RESERVED_FL		0x80000000 /* reserved for ext2 lib */
+#define EXT2_BTREE_FL			FS_BTREE_FL	/* btree format dir */
+#define EXT2_INDEX_FL			FS_INDEX_FL	/* hash-indexed directory */
+#define EXT2_IMAGIC_FL			FS_IMAGIC_FL	/* AFS directory */
+#define EXT2_JOURNAL_DATA_FL		FS_JOURNAL_DATA_FL /* Reserved for ext3 */
+#define EXT2_NOTAIL_FL			FS_NOTAIL_FL	/* file tail should not be merged */
+#define EXT2_DIRSYNC_FL			FS_DIRSYNC_FL	/* dirsync behaviour (directories only) */
+#define EXT2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
+#define EXT2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
  
-#define EXT2_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
-#define EXT2_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
+#define EXT2_FL_USER_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+#define EXT2_FL_USER_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
  
 /*
  * ioctl commands
  */
-#define	EXT2_IOC_GETFLAGS		_IOR('f', 1, long)
-#define	EXT2_IOC_SETFLAGS		_IOW('f', 2, long)
-#define	EXT2_IOC_GETVERSION		_IOR('v', 1, long)
-#define	EXT2_IOC_SETVERSION		_IOW('v', 2, long)
+#define	EXT2_IOC_GETFLAGS		FS_IOC_GETFLAGS
+#define	EXT2_IOC_SETFLAGS		FS_IOC_SETFLAGS
+#define	EXT2_IOC_GETVERSION		FS_IOC_GETVERSION
+#define	EXT2_IOC_SETVERSION		FS_IOC_SETVERSION
+
+/*
+ * ioctl commands in 32 bit emulation
+ */
+#define EXT2_IOC32_GETFLAGS		FS_IOC32_GETFLAGS
+#define EXT2_IOC32_SETFLAGS		FS_IOC32_SETFLAGS
+#define EXT2_IOC32_GETVERSION		FS_IOC32_GETVERSION
+#define EXT2_IOC32_SETVERSION		FS_IOC32_SETVERSION
  
 /*
  * Structure of an inode on the disk
@@ -216,19 +216,31 @@
 /*
  * 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
 #define EXT3_IOC_GETRSVSZ		_IOR('f', 5, long)
 #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
@@ -217,6 +217,45 @@
 #define FIBMAP	   _IO(0x00,1)	/* bmap access */
 #define FIGETBSZ   _IO(0x00,2)	/* get the block size used for bmap */
  
+#define	FS_IOC_GETFLAGS			_IOR('f', 1, long)
+#define	FS_IOC_SETFLAGS			_IOW('f', 2, long)
+#define	FS_IOC_GETVERSION		_IOR('v', 1, long)
+#define	FS_IOC_SETVERSION		_IOW('v', 2, long)
+#define FS_IOC32_GETFLAGS		_IOR('f', 1, int)
+#define FS_IOC32_SETFLAGS		_IOW('f', 2, int)
+#define FS_IOC32_GETVERSION		_IOR('v', 1, int)
+#define FS_IOC32_SETVERSION		_IOW('v', 2, int)
+
+/*
+ * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
+ */
+#define	FS_SECRM_FL			0x00000001 /* Secure deletion */
+#define	FS_UNRM_FL			0x00000002 /* Undelete */
+#define	FS_COMPR_FL			0x00000004 /* Compress file */
+#define FS_SYNC_FL			0x00000008 /* Synchronous updates */
+#define FS_IMMUTABLE_FL			0x00000010 /* Immutable file */
+#define FS_APPEND_FL			0x00000020 /* writes to file may only append */
+#define FS_NODUMP_FL			0x00000040 /* do not dump file */
+#define FS_NOATIME_FL			0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define FS_DIRTY_FL			0x00000100
+#define FS_COMPRBLK_FL			0x00000200 /* One or more compressed clusters */
+#define FS_NOCOMP_FL			0x00000400 /* Don't compress */
+#define FS_ECOMPR_FL			0x00000800 /* Compression error */
+/* End compression flags --- maybe not all used */
+#define FS_BTREE_FL			0x00001000 /* btree format dir */
+#define FS_INDEX_FL			0x00001000 /* hash-indexed directory */
+#define FS_IMAGIC_FL			0x00002000 /* AFS directory */
+#define FS_JOURNAL_DATA_FL		0x00004000 /* Reserved for ext3 */
+#define FS_NOTAIL_FL			0x00008000 /* file tail should not be merged */
+#define FS_DIRSYNC_FL			0x00010000 /* dirsync behaviour (directories only) */
+#define FS_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
+#define FS_RESERVED_FL			0x80000000 /* reserved for ext2 lib */
+
+#define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+#define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
+
+
 #define SYNC_FILE_RANGE_WAIT_BEFORE	1
 #define SYNC_FILE_RANGE_WRITE		2
 #define SYNC_FILE_RANGE_WAIT_AFTER	4
@@ -807,21 +807,19 @@
 #define set_sd_v1_first_direct_byte(sdp,v) \
                                 ((sdp)->sd_first_direct_byte = cpu_to_le32(v))
  
-#include <linux/ext2_fs.h>
-
 /* inode flags stored in sd_attrs (nee sd_reserved) */
  
 /* we want common flags to have the same values as in ext2,
    so chattr(1) will work without problems */
-#define REISERFS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
-#define REISERFS_APPEND_FL    EXT2_APPEND_FL
-#define REISERFS_SYNC_FL      EXT2_SYNC_FL
-#define REISERFS_NOATIME_FL   EXT2_NOATIME_FL
-#define REISERFS_NODUMP_FL    EXT2_NODUMP_FL
-#define REISERFS_SECRM_FL     EXT2_SECRM_FL
-#define REISERFS_UNRM_FL      EXT2_UNRM_FL
-#define REISERFS_COMPR_FL     EXT2_COMPR_FL
-#define REISERFS_NOTAIL_FL    EXT2_NOTAIL_FL
+#define REISERFS_IMMUTABLE_FL FS_IMMUTABLE_FL
+#define REISERFS_APPEND_FL    FS_APPEND_FL
+#define REISERFS_SYNC_FL      FS_SYNC_FL
+#define REISERFS_NOATIME_FL   FS_NOATIME_FL
+#define REISERFS_NODUMP_FL    FS_NODUMP_FL
+#define REISERFS_SECRM_FL     FS_SECRM_FL
+#define REISERFS_UNRM_FL      FS_UNRM_FL
+#define REISERFS_COMPR_FL     FS_COMPR_FL
+#define REISERFS_NOTAIL_FL    FS_NOTAIL_FL
  
 /* persistent flags that file inherits from the parent directory */
 #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL |	\
@@ -2168,10 +2166,10 @@
 #define REISERFS_IOC_UNPACK		_IOW(0xCD,1,long)
 /* define following flags to be the same as in ext2, so that chattr(1),
    lsattr(1) will work with us. */
-#define REISERFS_IOC_GETFLAGS		EXT2_IOC_GETFLAGS
-#define REISERFS_IOC_SETFLAGS		EXT2_IOC_SETFLAGS
-#define REISERFS_IOC_GETVERSION		EXT2_IOC_GETVERSION
-#define REISERFS_IOC_SETVERSION		EXT2_IOC_SETVERSION
+#define REISERFS_IOC_GETFLAGS		FS_IOC_GETFLAGS
+#define REISERFS_IOC_SETFLAGS		FS_IOC_SETFLAGS
+#define REISERFS_IOC_GETVERSION		FS_IOC_GETVERSION
+#define REISERFS_IOC_SETVERSION		FS_IOC_SETVERSION
  
 /* Locking primitives */
 /* Right now we are still falling back to (un)lock_kernel, but eventually that
...	...	@@ -22,7 +22,6 @@
22	22	*/
23	23
24	24	#include <linux/fs.h>
25		-#include <linux/ext2_fs.h>
26	25	#include "cifspdu.h"
27	26	#include "cifsglob.h"
28	27	#include "cifsproto.h"
...	...	@@ -74,7 +73,7 @@
74	73	}
75	74	break;
76	75	#ifdef CONFIG_CIFS_POSIX
77		- case EXT2_IOC_GETFLAGS:
	76	+ case FS_IOC_GETFLAGS:
78	77	if(CIFS_UNIX_EXTATTR_CAP & caps) {
79	78	if (pSMBFile == NULL)
80	79	break;
81	80
...	...	@@ -82,12 +81,12 @@
82	81	&ExtAttrBits, &ExtAttrMask);
83	82	if(rc == 0)
84	83	rc = put_user(ExtAttrBits &
85		- EXT2_FL_USER_VISIBLE,
	84	+ FS_FL_USER_VISIBLE,
86	85	(int __user *)arg);
87	86	}
88	87	break;
89	88
90		- case EXT2_IOC_SETFLAGS:
	89	+ case FS_IOC_SETFLAGS:
91	90	if(CIFS_UNIX_EXTATTR_CAP & caps) {
92	91	if(get_user(ExtAttrBits,(int __user *)arg)) {
93	92	rc = -EFAULT;
...	...	@@ -123,21 +123,6 @@
123	123	#include <linux/dvb/video.h>
124	124	#include <linux/lp.h>
125	125
126		-/* Aiee. Someone does not find a difference between int and long */
127		-#define EXT2_IOC32_GETFLAGS _IOR('f', 1, int)
128		-#define EXT2_IOC32_SETFLAGS _IOW('f', 2, int)
129		-#define EXT3_IOC32_GETVERSION _IOR('f', 3, int)
130		-#define EXT3_IOC32_SETVERSION _IOW('f', 4, int)
131		-#define EXT3_IOC32_GETRSVSZ _IOR('f', 5, int)
132		-#define EXT3_IOC32_SETRSVSZ _IOW('f', 6, int)
133		-#define EXT3_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int)
134		-#ifdef CONFIG_JBD_DEBUG
135		-#define EXT3_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int)
136		-#endif
137		-
138		-#define EXT2_IOC32_GETVERSION _IOR('v', 1, int)
139		-#define EXT2_IOC32_SETVERSION _IOW('v', 2, int)
140		-
141	126	static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,
142	127	unsigned long arg, struct file *f)
143	128	{
...	...	@@ -246,12 +246,8 @@
246	246
247	247	/* ext2 ioctls (EXT2_IOC_GETFLAGS and EXT2_IOC_SETFLAGS) to support
248	248	* chattr/lsattr */
249		-#define HFSPLUS_IOC_EXT2_GETFLAGS _IOR('f', 1, long)
250		-#define HFSPLUS_IOC_EXT2_SETFLAGS _IOW('f', 2, long)
251		-
252		-#define EXT2_FLAG_IMMUTABLE 0x00000010 /* Immutable file */
253		-#define EXT2_FLAG_APPEND 0x00000020 /* writes to file may only append */
254		-#define EXT2_FLAG_NODUMP 0x00000040 /* do not dump file */
	249	+#define HFSPLUS_IOC_EXT2_GETFLAGS FS_IOC_GETFLAGS
	250	+#define HFSPLUS_IOC_EXT2_SETFLAGS FS_IOC_SETFLAGS
255	251
256	252
257	253	/*
...	...	@@ -28,11 +28,11 @@
28	28	case HFSPLUS_IOC_EXT2_GETFLAGS:
29	29	flags = 0;
30	30	if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_IMMUTABLE)
31		- flags \|= EXT2_FLAG_IMMUTABLE; /* EXT2_IMMUTABLE_FL */
	31	+ flags \|= FS_IMMUTABLE_FL; /* EXT2_IMMUTABLE_FL */
32	32	if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_APPEND)
33		- flags \|= EXT2_FLAG_APPEND; /* EXT2_APPEND_FL */
	33	+ flags \|= FS_APPEND_FL; /* EXT2_APPEND_FL */
34	34	if (HFSPLUS_I(inode).userflags & HFSPLUS_FLG_NODUMP)
35		- flags \|= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */
	35	+ flags \|= FS_NODUMP_FL; /* EXT2_NODUMP_FL */
36	36	return put_user(flags, (int __user *)arg);
37	37	case HFSPLUS_IOC_EXT2_SETFLAGS: {
38	38	if (IS_RDONLY(inode))
39	39
40	40
41	41
42	42
...	...	@@ -44,32 +44,31 @@
44	44	if (get_user(flags, (int __user *)arg))
45	45	return -EFAULT;
46	46
47		- if (flags & (EXT2_FLAG_IMMUTABLE\|EXT2_FLAG_APPEND) \|\|
	47	+ if (flags & (FS_IMMUTABLE_FL\|FS_APPEND_FL) \|\|
48	48	HFSPLUS_I(inode).rootflags & (HFSPLUS_FLG_IMMUTABLE\|HFSPLUS_FLG_APPEND)) {
49	49	if (!capable(CAP_LINUX_IMMUTABLE))
50	50	return -EPERM;
51	51	}
52	52
53	53	/* don't silently ignore unsupported ext2 flags */
54		- if (flags & ~(EXT2_FLAG_IMMUTABLE\|EXT2_FLAG_APPEND\|
55		- EXT2_FLAG_NODUMP))
	54	+ if (flags & ~(FS_IMMUTABLE_FL\|FS_APPEND_FL\|FS_NODUMP_FL))
56	55	return -EOPNOTSUPP;
57	56
58		- if (flags & EXT2_FLAG_IMMUTABLE) { /* EXT2_IMMUTABLE_FL */
	57	+ if (flags & FS_IMMUTABLE_FL) { /* EXT2_IMMUTABLE_FL */
59	58	inode->i_flags \|= S_IMMUTABLE;
60	59	HFSPLUS_I(inode).rootflags \|= HFSPLUS_FLG_IMMUTABLE;
61	60	} else {
62	61	inode->i_flags &= ~S_IMMUTABLE;
63	62	HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_IMMUTABLE;
64	63	}
65		- if (flags & EXT2_FLAG_APPEND) { /* EXT2_APPEND_FL */
	64	+ if (flags & FS_APPEND_FL) { /* EXT2_APPEND_FL */
66	65	inode->i_flags \|= S_APPEND;
67	66	HFSPLUS_I(inode).rootflags \|= HFSPLUS_FLG_APPEND;
68	67	} else {
69	68	inode->i_flags &= ~S_APPEND;
70	69	HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_APPEND;
71	70	}
72		- if (flags & EXT2_FLAG_NODUMP) /* EXT2_NODUMP_FL */
	71	+ if (flags & FS_NODUMP_FL) /* EXT2_NODUMP_FL */
73	72	HFSPLUS_I(inode).userflags \|= HFSPLUS_FLG_NODUMP;
74	73	else
75	74	HFSPLUS_I(inode).userflags &= ~HFSPLUS_FLG_NODUMP;
...	...	@@ -6,7 +6,6 @@
6	6	*/
7	7
8	8	#include <linux/fs.h>
9		-#include <linux/ext2_fs.h>
10	9	#include <linux/ctype.h>
11	10	#include <linux/capability.h>
12	11	#include <linux/time.h>
...	...	@@ -22,13 +21,13 @@
22	21	long jfs_flag;
23	22	long ext2_flag;
24	23	} jfs_map[] = {
25		- {JFS_NOATIME_FL, EXT2_NOATIME_FL},
26		- {JFS_DIRSYNC_FL, EXT2_DIRSYNC_FL},
27		- {JFS_SYNC_FL, EXT2_SYNC_FL},
28		- {JFS_SECRM_FL, EXT2_SECRM_FL},
29		- {JFS_UNRM_FL, EXT2_UNRM_FL},
30		- {JFS_APPEND_FL, EXT2_APPEND_FL},
31		- {JFS_IMMUTABLE_FL, EXT2_IMMUTABLE_FL},
	24	+ {JFS_NOATIME_FL, FS_NOATIME_FL},
	25	+ {JFS_DIRSYNC_FL, FS_DIRSYNC_FL},
	26	+ {JFS_SYNC_FL, FS_SYNC_FL},
	27	+ {JFS_SECRM_FL, FS_SECRM_FL},
	28	+ {JFS_UNRM_FL, FS_UNRM_FL},
	29	+ {JFS_APPEND_FL, FS_APPEND_FL},
	30	+ {JFS_IMMUTABLE_FL, FS_IMMUTABLE_FL},
32	31	{0, 0},
33	32	};
34	33
...	...	@@ -165,41 +165,49 @@
165	165	#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1)
166	166
167	167	/*
168		- * Inode flags
	168	+ * Inode flags (GETFLAGS/SETFLAGS)
169	169	*/
170		-#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */
171		-#define EXT2_UNRM_FL 0x00000002 /* Undelete */
172		-#define EXT2_COMPR_FL 0x00000004 /* Compress file */
173		-#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */
174		-#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */
175		-#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */
176		-#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */
177		-#define EXT2_NOATIME_FL 0x00000080 /* do not update atime */
	170	+#define EXT2_SECRM_FL FS_SECRM_FL /* Secure deletion */
	171	+#define EXT2_UNRM_FL FS_UNRM_FL /* Undelete */
	172	+#define EXT2_COMPR_FL FS_COMPR_FL /* Compress file */
	173	+#define EXT2_SYNC_FL FS_SYNC_FL /* Synchronous updates */
	174	+#define EXT2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
	175	+#define EXT2_APPEND_FL FS_APPEND_FL /* writes to file may only append */
	176	+#define EXT2_NODUMP_FL FS_NODUMP_FL /* do not dump file */
	177	+#define EXT2_NOATIME_FL FS_NOATIME_FL /* do not update atime */
178	178	/* Reserved for compression usage... */
179		-#define EXT2_DIRTY_FL 0x00000100
180		-#define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */
181		-#define EXT2_NOCOMP_FL 0x00000400 /* Don't compress */
182		-#define EXT2_ECOMPR_FL 0x00000800 /* Compression error */
	179	+#define EXT2_DIRTY_FL FS_DIRTY_FL
	180	+#define EXT2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
	181	+#define EXT2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */
	182	+#define EXT2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
183	183	/* End compression flags --- maybe not all used */
184		-#define EXT2_BTREE_FL 0x00001000 /* btree format dir */
185		-#define EXT2_INDEX_FL 0x00001000 /* hash-indexed directory */
186		-#define EXT2_IMAGIC_FL 0x00002000 /* AFS directory */
187		-#define EXT2_JOURNAL_DATA_FL 0x00004000 /* Reserved for ext3 */
188		-#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
189		-#define EXT2_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
190		-#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
191		-#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
	184	+#define EXT2_BTREE_FL FS_BTREE_FL /* btree format dir */
	185	+#define EXT2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
	186	+#define EXT2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
	187	+#define EXT2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */
	188	+#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
	189	+#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
	190	+#define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
	191	+#define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
192	192
193		-#define EXT2_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
194		-#define EXT2_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
	193	+#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
	194	+#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
195	195
196	196	/*
197	197	* ioctl commands
198	198	*/
199		-#define EXT2_IOC_GETFLAGS _IOR('f', 1, long)
200		-#define EXT2_IOC_SETFLAGS _IOW('f', 2, long)
201		-#define EXT2_IOC_GETVERSION _IOR('v', 1, long)
202		-#define EXT2_IOC_SETVERSION _IOW('v', 2, long)
	199	+#define EXT2_IOC_GETFLAGS FS_IOC_GETFLAGS
	200	+#define EXT2_IOC_SETFLAGS FS_IOC_SETFLAGS
	201	+#define EXT2_IOC_GETVERSION FS_IOC_GETVERSION
	202	+#define EXT2_IOC_SETVERSION FS_IOC_SETVERSION
	203	+
	204	+/*
	205	+ * ioctl commands in 32 bit emulation
	206	+ */
	207	+#define EXT2_IOC32_GETFLAGS FS_IOC32_GETFLAGS
	208	+#define EXT2_IOC32_SETFLAGS FS_IOC32_SETFLAGS
	209	+#define EXT2_IOC32_GETVERSION FS_IOC32_GETVERSION
	210	+#define EXT2_IOC32_SETVERSION FS_IOC32_SETVERSION
203	211
204	212	/*
205	213	* Structure of an inode on the disk
...	...	@@ -216,19 +216,31 @@
216	216	/*
217	217	* ioctl commands
218	218	*/
219		-#define EXT3_IOC_GETFLAGS _IOR('f', 1, long)
220		-#define EXT3_IOC_SETFLAGS _IOW('f', 2, long)
	219	+#define EXT3_IOC_GETFLAGS FS_IOC_GETFLAGS
	220	+#define EXT3_IOC_SETFLAGS FS_IOC_SETFLAGS
221	221	#define EXT3_IOC_GETVERSION _IOR('f', 3, long)
222	222	#define EXT3_IOC_SETVERSION _IOW('f', 4, long)
223	223	#define EXT3_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long)
224	224	#define EXT3_IOC_GROUP_ADD _IOW('f', 8,struct ext3_new_group_input)
225		-#define EXT3_IOC_GETVERSION_OLD _IOR('v', 1, long)
226		-#define EXT3_IOC_SETVERSION_OLD _IOW('v', 2, long)
	225	+#define EXT3_IOC_GETVERSION_OLD FS_IOC_GETVERSION
	226	+#define EXT3_IOC_SETVERSION_OLD FS_IOC_SETVERSION
227	227	#ifdef CONFIG_JBD_DEBUG
228	228	#define EXT3_IOC_WAIT_FOR_READONLY _IOR('f', 99, long)
229	229	#endif
230	230	#define EXT3_IOC_GETRSVSZ _IOR('f', 5, long)
231	231	#define EXT3_IOC_SETRSVSZ _IOW('f', 6, long)
	232	+
	233	+/*
	234	+ * ioctl commands in 32 bit emulation
	235	+ */
	236	+#define EXT3_IOC32_GETVERSION _IOR('f', 3, int)
	237	+#define EXT3_IOC32_SETVERSION _IOW('f', 4, int)
	238	+#define EXT3_IOC32_GETRSVSZ _IOR('f', 5, int)
	239	+#define EXT3_IOC32_SETRSVSZ _IOW('f', 6, int)
	240	+#define EXT3_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int)
	241	+#ifdef CONFIG_JBD_DEBUG
	242	+#define EXT3_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int)
	243	+#endif
232	244
233	245	/*
234	246	* Mount options
...	...	@@ -217,6 +217,45 @@
217	217	#define FIBMAP _IO(0x00,1) /* bmap access */
218	218	#define FIGETBSZ _IO(0x00,2) /* get the block size used for bmap */
219	219
	220	+#define FS_IOC_GETFLAGS _IOR('f', 1, long)
	221	+#define FS_IOC_SETFLAGS _IOW('f', 2, long)
	222	+#define FS_IOC_GETVERSION _IOR('v', 1, long)
	223	+#define FS_IOC_SETVERSION _IOW('v', 2, long)
	224	+#define FS_IOC32_GETFLAGS _IOR('f', 1, int)
	225	+#define FS_IOC32_SETFLAGS _IOW('f', 2, int)
	226	+#define FS_IOC32_GETVERSION _IOR('v', 1, int)
	227	+#define FS_IOC32_SETVERSION _IOW('v', 2, int)
	228	+
	229	+/*
	230	+ * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
	231	+ */
	232	+#define FS_SECRM_FL 0x00000001 /* Secure deletion */
	233	+#define FS_UNRM_FL 0x00000002 /* Undelete */
	234	+#define FS_COMPR_FL 0x00000004 /* Compress file */
	235	+#define FS_SYNC_FL 0x00000008 /* Synchronous updates */
	236	+#define FS_IMMUTABLE_FL 0x00000010 /* Immutable file */
	237	+#define FS_APPEND_FL 0x00000020 /* writes to file may only append */
	238	+#define FS_NODUMP_FL 0x00000040 /* do not dump file */
	239	+#define FS_NOATIME_FL 0x00000080 /* do not update atime */
	240	+/* Reserved for compression usage... */
	241	+#define FS_DIRTY_FL 0x00000100
	242	+#define FS_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */
	243	+#define FS_NOCOMP_FL 0x00000400 /* Don't compress */
	244	+#define FS_ECOMPR_FL 0x00000800 /* Compression error */
	245	+/* End compression flags --- maybe not all used */
	246	+#define FS_BTREE_FL 0x00001000 /* btree format dir */
	247	+#define FS_INDEX_FL 0x00001000 /* hash-indexed directory */
	248	+#define FS_IMAGIC_FL 0x00002000 /* AFS directory */
	249	+#define FS_JOURNAL_DATA_FL 0x00004000 /* Reserved for ext3 */
	250	+#define FS_NOTAIL_FL 0x00008000 /* file tail should not be merged */
	251	+#define FS_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
	252	+#define FS_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
	253	+#define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
	254	+
	255	+#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
	256	+#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
	257	+
	258	+
220	259	#define SYNC_FILE_RANGE_WAIT_BEFORE 1
221	260	#define SYNC_FILE_RANGE_WRITE 2
222	261	#define SYNC_FILE_RANGE_WAIT_AFTER 4
...	...	@@ -807,21 +807,19 @@
807	807	#define set_sd_v1_first_direct_byte(sdp,v) \
808	808	((sdp)->sd_first_direct_byte = cpu_to_le32(v))
809	809
810		-#include <linux/ext2_fs.h>
811		-
812	810	/* inode flags stored in sd_attrs (nee sd_reserved) */
813	811
814	812	/* we want common flags to have the same values as in ext2,
815	813	so chattr(1) will work without problems */
816		-#define REISERFS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
817		-#define REISERFS_APPEND_FL EXT2_APPEND_FL
818		-#define REISERFS_SYNC_FL EXT2_SYNC_FL
819		-#define REISERFS_NOATIME_FL EXT2_NOATIME_FL
820		-#define REISERFS_NODUMP_FL EXT2_NODUMP_FL
821		-#define REISERFS_SECRM_FL EXT2_SECRM_FL
822		-#define REISERFS_UNRM_FL EXT2_UNRM_FL
823		-#define REISERFS_COMPR_FL EXT2_COMPR_FL
824		-#define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL
	814	+#define REISERFS_IMMUTABLE_FL FS_IMMUTABLE_FL
	815	+#define REISERFS_APPEND_FL FS_APPEND_FL
	816	+#define REISERFS_SYNC_FL FS_SYNC_FL
	817	+#define REISERFS_NOATIME_FL FS_NOATIME_FL
	818	+#define REISERFS_NODUMP_FL FS_NODUMP_FL
	819	+#define REISERFS_SECRM_FL FS_SECRM_FL
	820	+#define REISERFS_UNRM_FL FS_UNRM_FL
	821	+#define REISERFS_COMPR_FL FS_COMPR_FL
	822	+#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
825	823
826	824	/* persistent flags that file inherits from the parent directory */
827	825	#define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL \| \
...	...	@@ -2168,10 +2166,10 @@
2168	2166	#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long)
2169	2167	/* define following flags to be the same as in ext2, so that chattr(1),
2170	2168	lsattr(1) will work with us. */
2171		-#define REISERFS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
2172		-#define REISERFS_IOC_SETFLAGS EXT2_IOC_SETFLAGS
2173		-#define REISERFS_IOC_GETVERSION EXT2_IOC_GETVERSION
2174		-#define REISERFS_IOC_SETVERSION EXT2_IOC_SETVERSION
	2169	+#define REISERFS_IOC_GETFLAGS FS_IOC_GETFLAGS
	2170	+#define REISERFS_IOC_SETFLAGS FS_IOC_SETFLAGS
	2171	+#define REISERFS_IOC_GETVERSION FS_IOC_GETVERSION
	2172	+#define REISERFS_IOC_SETVERSION FS_IOC_SETVERSION
2175	2173
2176	2174	/* Locking primitives */
2177	2175	/* Right now we are still falling back to (un)lock_kernel, but eventually that