LU-20 ldiskfs: remove spurious warning message

Remove the spurious warning message that we added for the missing
extents option since the MDS never gets the extents option enabled.

	ldiskfs_fill_super: extents feature not enabled on this
	filesystem, use tune2fs

Remove the obsolete patch that removed this from the patch we added.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I9d896258b89ec3db528db59094572daac8dc207b
Reviewed-on: http://review.whamcloud.com/1572
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Yu Jian <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch
index f83b26a..316fa46 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch
@@ -149,7 +149,7 @@ diff -up linux-2.6.18-164/fs/ext4/super.c linux-2.6.18-164/fs/ext4/super.c
                default:
                        printk(KERN_ERR
                               "EXT4-fs: Unrecognized mount option \"%s\" "
-@@ -2501,6 +2534,18 @@ static int ext4_fill_super(struct super_
+@@ -2501,6 +2534,14 @@ static int ext4_fill_super(struct super_
        set_opt(sbi->s_mount_opt, BARRIER);
  
        /*
@@ -159,10 +159,6 @@ diff -up linux-2.6.18-164/fs/ext4/super.c linux-2.6.18-164/fs/ext4/super.c
 +      */
 +      if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS))
 +              set_opt(sbi->s_mount_opt, EXTENTS);
-+      else
-+              ext4_warning(sb,
-+                      "extents feature not enabled on this filesystem, "
-+                      "use tune2fs.");
 +
 +      /*
         * enable delayed allocation by default

diff --git a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
index a40b8a2..393aace 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
@@ -151,7 +151,7 @@ Index: linux-stage/fs/ext4/super.c
                default:
                        ext4_msg(sb, KERN_ERR,
                               "Unrecognized mount option \"%s\" "
-@@ -2901,6 +2933,17 @@ static int ext4_fill_super(struct super_
+@@ -2901,6 +2933,14 @@ static int ext4_fill_super(struct super_
        set_opt(sbi->s_mount_opt, BARRIER);
  
        /*
@@ -161,9 +161,6 @@ Index: linux-stage/fs/ext4/super.c
 +       */
 +      if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS))
 +              set_opt(sbi->s_mount_opt, EXTENTS);
-+      else
-+              ext4_warning(sb, "extents feature not enabled on this filesystem, "
-+                               "use tune2fs.");
 +
 +      /*
         * enable delayed allocation by default

diff --git a/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch
deleted file mode 100644 (file)
index ff72e25..0000000
--- a/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: linux-stage/fs/ext4/super.c
-===================================================================
---- linux-stage.orig/fs/ext4/super.c
-+++ linux-stage/fs/ext4/super.c
-@@ -2564,10 +2564,6 @@ static int ext4_fill_super(struct super_
-       */
-       if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS))
-               set_opt(sbi->s_mount_opt, EXTENTS);
--      else
--              ext4_warning(sb,
--                      "extents feature not enabled on this filesystem, "
--                      "use tune2fs.");
- 
-       /*
-        * enable delayed allocation by default