releases/2.6.32.17/0050-ext4-Conditionally-define-compat-ioctl-numbers.patch

   1 From e58debc557cca3fa1ce0f893978be42dfa489699 Mon Sep 17 00:00:00 2001
   2 From: Ben Hutchings <ben@decadent.org.uk>
   3 Date: Sun, 30 May 2010 22:50:04 -0400
   4 Subject: ext4: Conditionally define compat ioctl numbers
   5
   6 commit 899ad0cea6ad7ff4ba24b16318edbc3cbbe03fad upstream (as of v2.6.34-git13)
   7
   8 It is unnecessary, and in general impossible, to define the compat
   9 ioctl numbers except when building the filesystem with CONFIG_COMPAT
  10 defined.
  11
  12 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  13 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15 ---
  16  fs/ext4/ext4.h |    2 ++
  17  1 file changed, 2 insertions(+)
  18
  19 --- a/fs/ext4/ext4.h
  20 +++ b/fs/ext4/ext4.h
  21 @@ -462,6 +462,7 @@ struct ext4_new_group_data {
  22  #define EXT4_IOC_ALLOC_DA_BLKS         _IO('f', 12)
  23  #define EXT4_IOC_MOVE_EXT              _IOWR('f', 15, struct move_extent)
  24
  25 +#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
  26  /*
  27   * ioctl commands in 32 bit emulation
  28   */
  29 @@ -477,6 +478,7 @@ struct ext4_new_group_data {
  30  #endif
  31  #define EXT4_IOC32_GETVERSION_OLD      FS_IOC32_GETVERSION
  32  #define EXT4_IOC32_SETVERSION_OLD      FS_IOC32_SETVERSION
  33 +#endif
  34
  35
  36  /*