Add patch to fix ext4 compatibility with ext2 mount option (rhbz 770172)

3 files changed, 60 insertions, 1 deletions

diff --git a/TODO b/TODO
index ae2e01b0..a1da2ce4 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,7 @@
 **** Queued for 3.3 ***********************************************************************************
 drm-edid-try-harder-to-fix-up-broken-headers.patch
 Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
+ext4-Support-check-none-nocheck-mount-options.patch
 
 **** Other stuff that should go upstream (in decreasing likelyhood) ************************************
 
diff --git a/ext4-Support-check-none-nocheck-mount-options.patch b/ext4-Support-check-none-nocheck-mount-options.patch
new file mode 100644
index 00000000..281e4237
--- /dev/null
+++ b/ext4-Support-check-none-nocheck-mount-options.patch
@@ -0,0 +1,51 @@
+From ea75f7357e3a881bd1bd0db5e483fc6a8681567b Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@redhat.com>
+Date: Tue, 10 Jan 2012 09:39:02 -0500
+Subject: [PATCH] ext4: Support "check=none" "nocheck" mount options
+
+The ext2/ext3 filesystems supported "check=none" and "nocheck" as mount options
+even though that was already the default behavior and it essentially did
+nothing.  When using ext4 to mount ext2/ext3 filesystems, that mount option
+causes the mount to fail.  That isn't as backward compatible as it could be,
+so add support to ext4 to accept the option.
+
+Signed-off-by: Josh Boyer <jwboyer@redhat.com>
+---
+ fs/ext4/super.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 3e1329e..5ff09e7 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1333,7 +1333,7 @@ enum {
+ 	Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+-	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, Opt_nocheck,
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1409,6 +1409,8 @@ static const match_table_t tokens = {
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
++	{Opt_nocheck, "check=none"},
++	{Opt_nocheck, "nocheck"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1905,6 +1907,9 @@ set_qf_format:
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
++		case Opt_nocheck:
++			/* ext2/ext3 used to "support" this option.  Silently eat it */
++			break;
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
+-- 
+1.7.7.5
+
diff --git a/kernel.spec b/kernel.spec
index 5343092c..1f3d8731 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -751,6 +751,8 @@ Patch21045: nfs-client-freezer.patch
 #rhbz 770233
 Patch21065: Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
 
+Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
+
 # compat-wireless patches
 Patch50000: compat-wireless-config-fixups.patch
 Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1455,6 +1457,8 @@ ApplyPatch nfs-client-freezer.patch
 #rhbz 770233
 ApplyPatch Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
 
+ApplyPatch ext4-Support-check-none-nocheck-mount-options.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2289,6 +2293,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jan 10 2012 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix ext4 compatibility with ext2 mount option (rhbz 770172)
+
 * Thu Jan 05 2012 Adam Jackson <ajax@redhat.com>
 - Disable unsupported DRI1-only DRM drivers: i810, r128, tdfx