X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext4-misc-rhel6.patch;h=ba994255862974f57d42dd77777f1a13b457cdd3;hp=126e659b97eda5ec5b64d7d9c21c4c9ca9967a4a;hb=6bdb62e3d7ed206bcaef0cd3499f9cb56dc1fb92;hpb=e550abd05cf7ffddaedbef996be1baaae0912b4a

diff --git a/ldiskfs/kernel_patches/patches/ext4-misc-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-misc-rhel6.patch
index 126e659..ba99425 100644
--- a/ldiskfs/kernel_patches/patches/ext4-misc-rhel6.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-misc-rhel6.patch
@@ -1,7 +1,7 @@
 Index: linux-stage/fs/ext4/ext4_jbd2.h
 ===================================================================
---- linux-stage.orig/fs/ext4/ext4_jbd2.h	2011-03-14 16:33:17.087088010 +0800
-+++ linux-stage/fs/ext4/ext4_jbd2.h	2011-03-14 16:42:28.416591789 +0800
+--- linux-stage.orig/fs/ext4/ext4_jbd2.h	2011-04-01 09:35:54.779619166 +0800
++++ linux-stage/fs/ext4/ext4_jbd2.h	2011-04-01 10:55:10.328938378 +0800
 @@ -35,6 +35,8 @@
  	(EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)   \
  	 ? 27U : 8U)
@@ -13,8 +13,8 @@ Index: linux-stage/fs/ext4/ext4_jbd2.h
   * and the superblock, which are already accounted for. */
 Index: linux-stage/fs/ext4/ext4_extents.h
 ===================================================================
---- linux-stage.orig/fs/ext4/ext4_extents.h	2011-03-14 16:33:17.076087785 +0800
-+++ linux-stage/fs/ext4/ext4_extents.h	2011-03-14 16:43:08.254267525 +0800
+--- linux-stage.orig/fs/ext4/ext4_extents.h	2011-04-01 09:35:55.688621923 +0800
++++ linux-stage/fs/ext4/ext4_extents.h	2011-04-01 09:35:57.573627638 +0800
 @@ -58,6 +58,12 @@
   */
  #define EXT_STATS_
@@ -47,8 +47,8 @@ Index: linux-stage/fs/ext4/ext4_extents.h
  				      struct ext4_extent *ex2);
 Index: linux-stage/fs/ext4/mballoc.c
 ===================================================================
---- linux-stage.orig/fs/ext4/mballoc.c	2011-03-14 16:33:27.072292006 +0800
-+++ linux-stage/fs/ext4/mballoc.c	2011-03-14 16:41:02.500138039 +0800
+--- linux-stage.orig/fs/ext4/mballoc.c	2011-04-01 09:35:57.382627058 +0800
++++ linux-stage/fs/ext4/mballoc.c	2011-04-01 10:55:08.194931915 +0800
 @@ -4039,6 +4039,7 @@
  	if (ac)
  		kmem_cache_free(ext4_ac_cachep, ac);
@@ -66,8 +66,8 @@ Index: linux-stage/fs/ext4/mballoc.c
 +
 Index: linux-stage/fs/ext4/super.c
 ===================================================================
---- linux-stage.orig/fs/ext4/super.c	2011-03-14 16:33:17.036086967 +0800
-+++ linux-stage/fs/ext4/super.c	2011-03-14 16:41:14.964348396 +0800
+--- linux-stage.orig/fs/ext4/super.c	2011-04-01 09:35:57.207626528 +0800
++++ linux-stage/fs/ext4/super.c	2011-04-01 10:57:29.490360042 +0800
 @@ -127,6 +127,7 @@
  		(EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
  		 (__u32)le16_to_cpu(bg->bg_itable_unused_hi) << 16 : 0);
@@ -76,7 +76,13 @@ Index: linux-stage/fs/ext4/super.c
  
  void ext4_block_bitmap_set(struct super_block *sb,
  			   struct ext4_group_desc *bg, ext4_fsblk_t blk)
-@@ -1491,6 +1492,7 @@
+@@ -1486,11 +1487,13 @@
+ 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
+ 	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
+ 	Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
++	Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+ 	Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version,
+ 	Opt_stripe, Opt_delalloc, Opt_nodelalloc,
  	Opt_block_validity, Opt_noblock_validity,
  	Opt_inode_readahead_blks, Opt_journal_ioprio,
  	Opt_discard, Opt_nodiscard,
@@ -84,7 +90,17 @@ Index: linux-stage/fs/ext4/super.c
  };
  
  static const match_table_t tokens = {
-@@ -1557,6 +1559,7 @@
+@@ -1542,6 +1545,9 @@
+ 	{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_barrier, "barrier"},
+ 	{Opt_nobarrier, "nobarrier"},
+@@ -1557,6 +1563,7 @@
  	{Opt_auto_da_alloc, "auto_da_alloc=%u"},
  	{Opt_auto_da_alloc, "auto_da_alloc"},
  	{Opt_noauto_da_alloc, "noauto_da_alloc"},
@@ -92,7 +108,18 @@ Index: linux-stage/fs/ext4/super.c
  	{Opt_discard, "discard"},
  	{Opt_nodiscard, "nodiscard"},
  	{Opt_err, NULL},
-@@ -1997,6 +2000,8 @@
+@@ -1914,6 +1921,10 @@
+ 			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:
+@@ -1997,6 +2008,8 @@
  		case Opt_nodiscard:
  			clear_opt(sbi->s_mount_opt, DISCARD);
  			break;
@@ -103,8 +130,8 @@ Index: linux-stage/fs/ext4/super.c
  			       "Unrecognized mount option \"%s\" "
 Index: linux-stage/fs/ext4/ext4_jbd2.c
 ===================================================================
---- linux-stage.orig/fs/ext4/ext4_jbd2.c	2011-03-14 16:33:17.049087232 +0800
-+++ linux-stage/fs/ext4/ext4_jbd2.c	2011-03-14 16:34:39.849759386 +0800
+--- linux-stage.orig/fs/ext4/ext4_jbd2.c	2011-04-01 09:35:54.145617245 +0800
++++ linux-stage/fs/ext4/ext4_jbd2.c	2011-04-01 09:35:57.678627955 +0800
 @@ -31,6 +31,7 @@
  	}
  	return err;
@@ -120,8 +147,8 @@ Index: linux-stage/fs/ext4/ext4_jbd2.c
 +EXPORT_SYMBOL(__ext4_handle_dirty_metadata);
 Index: linux-stage/fs/ext4/ext4.h
 ===================================================================
---- linux-stage.orig/fs/ext4/ext4.h	2011-03-14 16:33:17.056087375 +0800
-+++ linux-stage/fs/ext4/ext4.h	2011-03-14 16:45:40.754870806 +0800
+--- linux-stage.orig/fs/ext4/ext4.h	2011-04-01 09:35:57.349626959 +0800
++++ linux-stage/fs/ext4/ext4.h	2011-04-01 10:55:17.605960429 +0800
 @@ -1110,6 +1110,9 @@
  
  #define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime
@@ -143,8 +170,8 @@ Index: linux-stage/fs/ext4/ext4.h
  		struct buffer_head *bh, ext4_fsblk_t blocknr);
 Index: linux-stage/fs/ext4/inode.c
 ===================================================================
---- linux-stage.orig/fs/ext4/inode.c	2011-03-14 16:33:17.063087519 +0800
-+++ linux-stage/fs/ext4/inode.c	2011-03-14 16:34:39.913760434 +0800
+--- linux-stage.orig/fs/ext4/inode.c	2011-04-01 09:35:55.884622516 +0800
++++ linux-stage/fs/ext4/inode.c	2011-04-01 09:35:57.750628175 +0800
 @@ -5199,6 +5199,7 @@
  	iget_failed(inode);
  	return ERR_PTR(ret);
@@ -155,8 +182,8 @@ Index: linux-stage/fs/ext4/inode.c
  				struct ext4_inode *raw_inode,
 Index: linux-stage/fs/ext4/extents.c
 ===================================================================
---- linux-stage.orig/fs/ext4/extents.c	2011-03-14 16:33:17.070087661 +0800
-+++ linux-stage/fs/ext4/extents.c	2011-03-14 16:41:04.894178430 +0800
+--- linux-stage.orig/fs/ext4/extents.c	2011-04-01 09:35:55.753622118 +0800
++++ linux-stage/fs/ext4/extents.c	2011-04-01 10:55:10.320938356 +0800
 @@ -1866,9 +1866,7 @@
  	while (block < last && block != EXT_MAX_BLOCK) {
  		num = last - block;