From 04a1bda03c865a0afa09bff8b7a3fab4652b13fc Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 21 Oct 2011 04:06:16 -0600 Subject: [PATCH] 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, nor do we want it to be enabled for the MDT filesystem either. ldiskfs_fill_super: extents feature not enabled on this filesystem, use tune2fs Original-Commit: 6541ea42978e73e0262273f6bd5ce0b71689fdc2 Signed-off-by: Andreas Dilger Change-Id: I9d896258b89ec3db528db59094572daac8dccab0 Reviewed-on: http://review.whamcloud.com/4028 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Niu Yawei --- .../kernel_patches/patches/ext4-extents-mount-option-rhel5.patch | 6 +----- .../kernel_patches/patches/ext4-extents-mount-option-rhel6.patch | 5 +---- ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) 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 --- 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 c99c672..4aca839 100644 --- 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\" " -@@ -2972,6 +3004,17 @@ static int ext4_fill_super(struct super_ +@@ -2972,6 +3004,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/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series index 9f36eb7..192c262 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series @@ -17,6 +17,7 @@ ext4-ext_generation-sles11.patch ext4-super-warning.patch ext4-alloc-policy-2.6-sles11.patch ext4-disable-delalloc-sles11.patch +ext4-remove-extents-warning-rhel5.patch ext4-lustre-i_version.patch ext4-lock-cached_extent.patch ext4-convert-group-lock-sles11.patch -- 1.8.3.1