LU-6030 osd-ldiskfs: improve mount option handling

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel6.4 / ext4-misc.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch b/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch
index 21ea811..e295a95 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch
+++ b/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch
@@ -2,16 +2,6 @@ Index: linux-stage/fs/ext4/ext4.h
 ===================================================================
 --- linux-stage.orig/fs/ext4/ext4.h
 +++ linux-stage/fs/ext4/ext4.h
-@@ -1256,6 +1256,9 @@ EXT4_INODE_BIT_FNS(state, state_flags)
- 
- #define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime
- 
-+/* Has been moved to linux/magic.h but we need it for Lustre */
-+#define EXT4_SUPER_MAGIC      0xEF53
-+
- /*
-  * Codes for operating systems
-  */
 @@ -1757,6 +1760,9 @@ extern void ext4_add_groupblocks(handle_
                                ext4_fsblk_t block, unsigned long count);
  extern int ext4_trim_fs(struct super_block *, struct fstrim_range *);
@@ -181,57 +171,3 @@ 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)
-@@ -1176,11 +1177,14 @@ enum {
-       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, Opt_init_itable, Opt_noinit_itable,
-+      Opt_mballoc,
-+      Opt_discard, Opt_nodiscard,
-+      Opt_init_itable, Opt_noinit_itable,
- };
- 
- static const match_table_t tokens = {
-@@ -1232,6 +1236,9 @@ static const 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_barrier, "barrier"},
-       {Opt_nobarrier, "nobarrier"},
-@@ -1247,6 +1254,7 @@ static const match_table_t tokens = {
-       {Opt_auto_da_alloc, "auto_da_alloc=%u"},
-       {Opt_auto_da_alloc, "auto_da_alloc"},
-       {Opt_noauto_da_alloc, "noauto_da_alloc"},
-+      {Opt_mballoc, "mballoc"},
-       {Opt_discard, "discard"},
-       {Opt_nodiscard, "nodiscard"},
-       {Opt_init_itable, "init_itable=%u"},
-@@ -1607,6 +1615,10 @@ set_qf_format:
-                       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:
-@@ -1704,6 +1716,8 @@ set_qf_format:
-               case Opt_noinit_itable:
-                       clear_opt(sbi->s_mount_opt, INIT_INODE_TABLE);
-                       break;
-+              case Opt_mballoc:
-+                      break;
-               default:
-                       ext4_msg(sb, KERN_ERR,
-                              "Unrecognized mount option \"%s\" "