rpms/kernel/F-9 linux-2.6.27.14-ext4-fix-dont-allow-new-groups.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.22, 1.891.2.23 linux-2.6.27.14-ext4-fix-cache-init.patch, 1.1.2.1, 1.1.2.2

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec linux-2.6.27.14-ext4-fix-cache-init.patch 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6.27.14-ext4-fix-dont-allow-new-groups.patch 
Log Message:
Fix more ext4 patch queue problems.
  (http://marc.info/?l=linux-kernel&m=123433917809157&w=2)

linux-2.6.27.14-ext4-fix-dont-allow-new-groups.patch:

--- NEW FILE linux-2.6.27.14-ext4-fix-dont-allow-new-groups.patch ---
Add missing pieces to the below patch in the 2.6.27 ext4 patchset.
http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=commitdiff;h=fd3bd090d7cc93292d3fa361b9c323752417bd7b
"ext4: Don't allow new groups to be added during block allocation"

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
@@ -1055,7 +1055,8 @@ static void ext4_mb_release_desc(struct 
 	if (e4b->bd_buddy_page)
 		page_cache_release(e4b->bd_buddy_page);
 	/* Done with the buddy cache */
-	up_read(e4b->alloc_semp);
+	if (e4b->alloc_semp)
+		up_read(e4b->alloc_semp);
 }
 
 
@@ -1375,6 +1376,9 @@ static void ext4_mb_use_best_found(struc
 	get_page(ac->ac_bitmap_page);
 	ac->ac_buddy_page = e4b->bd_buddy_page;
 	get_page(ac->ac_buddy_page);
+	/* on allocation we use ac to track the held semaphore */
+	ac->alloc_semp =  e4b->alloc_semp;
+	e4b->alloc_semp = NULL;
 	/* store last allocated for subsequent stream allocation */
 	if ((ac->ac_flags & EXT4_MB_HINT_DATA)) {
 		spin_lock(&sbi->s_md_lock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.22
retrieving revision 1.891.2.23
diff -u -r1.891.2.22 -r1.891.2.23
--- kernel.spec	11 Feb 2009 00:07:44 -0000	1.891.2.22
+++ kernel.spec	11 Feb 2009 18:22:43 -0000	1.891.2.23
@@ -738,6 +738,7 @@
 Patch2903: linux-2.6.27.9-ext4-cap-check-delay.patch
 Patch2904: linux-2.6.27.14-ext4-patch-queue.patch
 Patch2905: linux-2.6.27.14-ext4-fix-cache-init.patch
+Patch2906: linux-2.6.27.14-ext4-fix-dont-allow-new-groups.patch
 
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
@@ -1322,6 +1323,8 @@
 ApplyPatch linux-2.6.27.14-ext4-patch-queue.patch
 # fix misapplied chunk in ext4 queue
 ApplyPatch linux-2.6.27.14-ext4-fix-cache-init.patch
+# fix more ext4 patch breakage
+ApplyPatch linux-2.6.27.14-ext4-fix-dont-allow-new-groups.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1937,6 +1940,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Feb 11 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.15-78.2.23
+- Fix more ext4 patch queue problems.
+  (http://marc.info/?l=linux-kernel&m=123433917809157&w=2)
+
 * Tue Feb 10 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.15-78.2.22
 - Fix oops caused by misapplied chunk in the ext4 patchset (F10#484972)
 - Fix detection of slave ATA devices on pata_sch (F10#467457)

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

Index: linux-2.6.27.14-ext4-fix-cache-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/Attic/linux-2.6.27.14-ext4-fix-cache-init.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6.27.14-ext4-fix-cache-init.patch	11 Feb 2009 00:07:44 -0000	1.1.2.1
+++ linux-2.6.27.14-ext4-fix-cache-init.patch	11 Feb 2009 18:22:44 -0000	1.1.2.2
@@ -1,3 +1,9 @@
+Move init of the ext4_free_block_extents cache to the right place.
+Original patch that misapplies this is at:
+http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=commitdiff;h=71ae3e256af82b77100bd2e7392fd510aca0b8b9
+"ext4: Use an rbtree for tracking blocks freed during transaction."
+
+
 Index: linux-2.6.27.noarch/fs/ext4/mballoc.c
 ===================================================================
 --- linux-2.6.27.noarch.orig/fs/ext4/mballoc.c