b=24037 Remove iopen ldiskfs patch for rhel5.

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-include-fixes-2.6-rhel4.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch
index 52e5521..9937044 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch
@@ -18,3 +18,36 @@ Index: linux-stage/include/linux/ext3_fs.h
  #define EXT2_MOUNT_NOLOAD             EXT3_MOUNT_NOLOAD
  #define EXT2_MOUNT_ABORT              EXT3_MOUNT_ABORT
  #define EXT2_MOUNT_DATA_FLAGS         EXT3_MOUNT_DATA_FLAGS
+Index: linux-2.6.18-53.1.21/fs/ext3/super.c
+===================================================================
+--- linux-2.6.18-53.1.21.orig/fs/ext3/super.c
++++ linux-2.6.18-53.1.21/fs/ext3/super.c
+@@ -677,6 +677,7 @@ enum {
+       Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
+       Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
+       Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
++      Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+       Opt_grpquota
+ };
+ 
+@@ -726,6 +727,9 @@ static match_table_t tokens = {
+       {Opt_noquota, "noquota"},
+       {Opt_quota, "quota"},
+       {Opt_usrquota, "usrquota"},
++      {Opt_iopen, "iopen"},
++      {Opt_noiopen, "noiopen"},
++      {Opt_iopen_nopriv, "iopen_nopriv"},
+       {Opt_barrier, "barrier=%u"},
+       {Opt_err, NULL},
+       {Opt_resize, "resize"},
+@@ -1041,6 +1045,10 @@ clear_qf_name:
+                       else
+                               clear_opt(sbi->s_mount_opt, BARRIER);
+                       break;
++              case Opt_iopen:
++              case Opt_noiopen:
++              case Opt_iopen_nopriv:
++                      break;
+               case Opt_ignore:
+                       break;
+               case Opt_resize: