rpms/kernel/F-10 linux-2.6.27.14-ext4-fix-cache-init.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.21, 1.1206.2.22

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8925

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6.27.14-ext4-fix-cache-init.patch 
Log Message:
Fix oops caused by misapplied chunk in the ext4 patchset (#484972)

linux-2.6.27.14-ext4-fix-cache-init.patch:

--- NEW FILE linux-2.6.27.14-ext4-fix-cache-init.patch ---
Index: linux-2.6.27.noarch/fs/ext4/mballoc.c
===================================================================
--- linux-2.6.27.noarch.orig/fs/ext4/mballoc.c
+++ linux-2.6.27.noarch/fs/ext4/mballoc.c
@@ -3060,6 +3060,16 @@ int __init init_ext4_mballoc(void)
 		kmem_cache_destroy(ext4_pspace_cachep);
 		return -ENOMEM;
 	}
+
+	ext4_free_ext_cachep =
+		kmem_cache_create("ext4_free_block_extents",
+				     sizeof(struct ext4_free_data),
+				     0, SLAB_RECLAIM_ACCOUNT, NULL);
+	if (ext4_free_ext_cachep == NULL) {
+		kmem_cache_destroy(ext4_pspace_cachep);
+		kmem_cache_destroy(ext4_ac_cachep);
+		return -ENOMEM;
+	}
 #ifdef CONFIG_PROC_FS
 	proc_root_ext4 = proc_mkdir("fs/ext4", NULL);
 	if (proc_root_ext4 == NULL)
@@ -3597,15 +3607,6 @@ ext4_mb_use_preallocated(struct ext4_all
 		return 1;
 	}
 
-	ext4_free_ext_cachep =
-		kmem_cache_create("ext4_free_block_extents",
-				     sizeof(struct ext4_free_data),
-				     0, SLAB_RECLAIM_ACCOUNT, NULL);
-	if (ext4_free_ext_cachep == NULL) {
-		kmem_cache_destroy(ext4_pspace_cachep);
-		kmem_cache_destroy(ext4_ac_cachep);
-		return -ENOMEM;
-	}
 	return 0;
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.21
retrieving revision 1.1206.2.22
diff -u -r1.1206.2.21 -r1.1206.2.22
--- kernel.spec	10 Feb 2009 06:44:57 -0000	1.1206.2.21
+++ kernel.spec	10 Feb 2009 23:50:00 -0000	1.1206.2.22
@@ -744,6 +744,7 @@
 # Delay capable check to avoid most AVCs (#478299)
 Patch2901: linux-2.6.27.9-ext4-cap-check-delay.patch
 Patch2902: linux-2.6.27.14-ext4-patch-queue.patch
+Patch2903: linux-2.6.27.14-ext4-fix-cache-init.patch
 
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
@@ -1168,6 +1169,8 @@
 ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
 ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch
 ApplyPatch linux-2.6.27.14-ext4-patch-queue.patch
+# ext4 queue has a misapplied chunk
+ApplyPatch linux-2.6.27.14-ext4-fix-cache-init.patch
 
 # xfs
 
@@ -1942,6 +1945,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Feb 10 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.15-170.2.22
+- Fix oops caused by misapplied chunk in the ext4 patchset (#484972)
+
 * Tue Feb 10 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.15-170.2.21
 - Fix detection of slave ATA devices on pata_sch (#467457)