LU-83 Kernel BUG in ext4 if wrong mount option is given

Original attempt at landing a fix for this bug landed hopelessly
broken patch.
Replace the patch with proper code.

Change-Id: Iddc38c4254b1f981b10e272b671fad232e20fd70
Signed-off-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/314
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch b/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch
index 12a8dc8..0adb6b0 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch
@@ -1,19 +1,12 @@
-diff --git a/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch b/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch
-new file mode 100644
-index 0000000..9de80c0
---- /dev/null
-+++ b/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch
-@@ -0,0 +1,12 @@
-+Index: linux-stage/fs/ext4/super.c
-+===================================================================
-+--- linux-stage.orig/fs/ext4/super.c
-++++ linux-stage/fs/ext4/super.c
-+@@ -3466,7 +3466,6 @@ failed_mount:
-+       brelse(bh);
-+ out_fail:
-+       sb->s_fs_info = NULL;
-+-      kfree(&sbi->s_blockgroup_lock);
-+       kfree(sbi);
-+       lock_kernel();
-+       return ret;
-
+Index: linux-stage/fs/ext4/super.c
+===================================================================
+--- linux-stage.orig/fs/ext4/super.c
++++ linux-stage/fs/ext4/super.c
+@@ -3427,7 +3427,6 @@ failed_mount:
+       brelse(bh);
+ out_fail:
+       sb->s_fs_info = NULL;
+-      kfree(&sbi->s_blockgroup_lock);
+       kfree(sbi);
+       lock_kernel();
+       return ret;