From e84a4593535b9a159ad2ac38b613f8700191e7a2 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Thu, 10 Mar 2011 20:30:17 -0500 Subject: [PATCH] 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 Reviewed-on: http://review.whamcloud.com/314 Tested-by: Hudson Reviewed-by: Johann Lombardi --- .../patches/ext4-failed-mount-b23368.patch | 31 +++++++++------------- 1 file changed, 12 insertions(+), 19 deletions(-) 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 --- 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; -- 1.8.3.1