ext4: Conditionally define compat ioctl numbers
authorBen Hutchings <ben@decadent.org.uk>
Mon, 17 May 2010 09:00:00 +0000 (05:00 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 17 May 2010 09:00:00 +0000 (05:00 -0400)
It is unnecessary, and in general impossible, to define the compat
ioctl numbers except when building the filesystem with CONFIG_COMPAT
defined.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
fs/ext4/ext4.h

index 74414884580c94ea57ff3648fe75f5f2b68855a9..d8c28f658cb08d8c7804bf7ce9d208f9b66d5f29 100644 (file)
@@ -498,6 +498,7 @@ struct ext4_new_group_data {
 #define EXT4_IOC_ALLOC_DA_BLKS         _IO('f', 12)
 #define EXT4_IOC_MOVE_EXT              _IOWR('f', 15, struct move_extent)
 
+#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
 /*
  * ioctl commands in 32 bit emulation
  */
@@ -513,6 +514,7 @@ struct ext4_new_group_data {
 #endif
 #define EXT4_IOC32_GETVERSION_OLD      FS_IOC32_GETVERSION
 #define EXT4_IOC32_SETVERSION_OLD      FS_IOC32_SETVERSION
+#endif
 
 
 /*