ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch

   1 Index: linux-stage/include/linux/ext3_fs.h
   2 ===================================================================
   3 --- linux-stage.orig/include/linux/ext3_fs.h    2005-02-25 14:53:56.424908168 +0200
   4 +++ linux-stage/include/linux/ext3_fs.h 2005-02-25 14:53:59.376459464 +0200
   5 @@ -361,12 +361,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
  21 Index: linux-2.6.18-53.1.21/fs/ext3/super.c
  22 ===================================================================
  23 --- linux-2.6.18-53.1.21.orig/fs/ext3/super.c
  24 +++ linux-2.6.18-53.1.21/fs/ext3/super.c
  25 @@ -677,6 +677,7 @@ enum {
  26         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
  27         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
  28         Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
  29 +       Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
  30         Opt_grpquota
  31  };
  32
  33 @@ -726,6 +727,9 @@ static match_table_t tokens = {
  34         {Opt_noquota, "noquota"},
  35         {Opt_quota, "quota"},
  36         {Opt_usrquota, "usrquota"},
  37 +       {Opt_iopen, "iopen"},
  38 +       {Opt_noiopen, "noiopen"},
  39 +       {Opt_iopen_nopriv, "iopen_nopriv"},
  40         {Opt_barrier, "barrier=%u"},
  41         {Opt_err, NULL},
  42         {Opt_resize, "resize"},
  43 @@ -1041,6 +1045,10 @@ clear_qf_name:
  44                         else
  45                                 clear_opt(sbi->s_mount_opt, BARRIER);
  46                         break;
  47 +               case Opt_iopen:
  48 +               case Opt_noiopen:
  49 +               case Opt_iopen_nopriv:
  50 +                       break;
  51                 case Opt_ignore:
  52                         break;
  53                 case Opt_resize: