lustre/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch

   1 Index: linux-stage/include/linux/ext3_fs.h
   2 ===================================================================
   3 --- linux-stage.orig/include/linux/ext3_fs.h    2004-04-02 16:43:37.000000000 -0500
   4 +++ linux-stage/include/linux/ext3_fs.h 2004-04-02 16:43:37.000000000 -0500
   5 @@ -331,12 +331,13 @@
   6  #define EXT3_MOUNT_IOPEN_NOPRIV                0x100000/* Make iopen world-readable */
   7
   8  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
   9 -#ifndef _LINUX_EXT2_FS_H
  10 +#ifndef clear_opt
  11  #define clear_opt(o, opt)              o &= ~EXT3_MOUNT_##opt
  12  #define set_opt(o, opt)                        o |= EXT3_MOUNT_##opt
  13  #define test_opt(sb, opt)              (EXT3_SB(sb)->s_mount_opt & \
  14                                          EXT3_MOUNT_##opt)
  15 -#else
  16 +#endif
  17 +#ifndef EXT2_MOUNT_NOLOAD
  18  #define EXT2_MOUNT_NOLOAD              EXT3_MOUNT_NOLOAD
  19  #define EXT2_MOUNT_ABORT               EXT3_MOUNT_ABORT
  20  #define EXT2_MOUNT_DATA_FLAGS          EXT3_MOUNT_DATA_FLAGS