ldiskfs/kernel_patches/patches/ext4-include-fixes-2.6-sles11.patch

   1 Index: linux-2.6.18.i386/fs/ext4/ext4.h
   2 ===================================================================
   3 --- linux-2.6.18.i386.orig/fs/ext4/ext4.h
   4 +++ linux-2.6.18.i386/fs/ext4/ext4.h
   5 @@ -541,12 +541,13 @@ do {                                                                             \
   6  #define EXT4_MOUNT_IOPEN               0x8000000 /* Allow access via iopen */
   7  #define EXT4_MOUNT_IOPEN_NOPRIV                0x10000000 /* Make iopen world-readable */
   8  /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */
   9 -#ifndef _LINUX_EXT2_FS_H
  10 +#ifndef clear_opt
  11  #define clear_opt(o, opt)              o &= ~EXT4_MOUNT_##opt
  12  #define set_opt(o, opt)                        o |= EXT4_MOUNT_##opt
  13  #define test_opt(sb, opt)              (EXT4_SB(sb)->s_mount_opt & \
  14                                          EXT4_MOUNT_##opt)
  15 -#else
  16 +#endif
  17 +#ifndef EXT2_MOUNT_NOLOAD
  18  #define EXT2_MOUNT_NOLOAD              EXT4_MOUNT_NOLOAD
  19  #define EXT2_MOUNT_ABORT               EXT4_MOUNT_ABORT
  20  #define EXT2_MOUNT_DATA_FLAGS          EXT4_MOUNT_DATA_FLAGS