rpms/kernel/F-10 linux-2.6-ext4-ENOSPC-debug.patch, NONE, 1.1.2.2 config-x86-generic, 1.55.2.1, 1.55.2.2 kernel.spec, 1.1206.2.31, 1.1206.2.32

Chuck Ebbert cebbert at fedoraproject.org
Sat Feb 21 23:57:23 UTC 2009


Author: cebbert

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

Modified Files:
      Tag: private-fedora-10-2_6_27
	config-x86-generic kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-ext4-ENOSPC-debug.patch 
Log Message:
Set X86_MSR=y and X86_CPUID=y on 32-bit kernel.
Copy ext4 ENOSPC fix from rawhide.

linux-2.6-ext4-ENOSPC-debug.patch:

--- NEW FILE linux-2.6-ext4-ENOSPC-debug.patch ---
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Mon Feb 16 13:51:16 2009 -0500

    ext4: Add fallback for find_group_flex
    
    This is a workaround for find_group_flex() which badly needs to be
    replaced.  One of its problems (besides ignoring the Orlov algorithm)
    is that it is a bit hyperactive about returning failure under
    suspicious circumstances.  This can lead to spurious ENOSPC failures.
    Work around this for now by retrying the search using
    find_group_other() if find_group_flex() returns -1.  If
    find_group_other() succeeds when find_group_flex(), log a warning
    message.  I can't quite find the motivation to spend effort working on
    fixing find_group_flex() given that I want to replace it all anyway
    (and in fact work on the replacement code is underway), so we may
    leave the workaround for as long as find_group_flex() stays in the
    kernel...
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

XXX ERS: Remove printk, it's too much noise now, we got the bug reports

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index a200059..21080ab 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -715,6 +715,8 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode)
 
 	if (sbi->s_log_groups_per_flex) {
 		ret2 = find_group_flex(sb, dir, &group);
+		if (ret2 == -1)
+			ret2 = find_group_other(sb, dir, &group);
 		goto got_group;
 	}


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86-generic,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -u -r1.55.2.1 -r1.55.2.2
--- config-x86-generic	9 Feb 2009 21:10:16 -0000	1.55.2.1
+++ config-x86-generic	21 Feb 2009 23:56:53 -0000	1.55.2.2
@@ -65,8 +65,8 @@
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_MICROCODE=m
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.31
retrieving revision 1.1206.2.32
diff -u -r1.1206.2.31 -r1.1206.2.32
--- kernel.spec	21 Feb 2009 01:02:37 -0000	1.1206.2.31
+++ kernel.spec	21 Feb 2009 23:56:53 -0000	1.1206.2.32
@@ -743,6 +743,7 @@
 Patch2900: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
 # Delay capable check to avoid most AVCs (#478299)
 Patch2901: linux-2.6.27.9-ext4-cap-check-delay.patch
+Patch2904: linux-2.6-ext4-ENOSPC-debug.patch
 
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
@@ -1165,6 +1166,7 @@
 # ext4
 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-ext4-ENOSPC-debug.patch
 
 # xfs
 
@@ -1935,7 +1937,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Sat Feb 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.19-170.2.29.rc1
+* Sat Feb 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.19-170.2.32
+- Set X86_MSR=y and X86_CPUID=y on 32-bit kernel.
+- Copy ext4 ENOSPC fix from rawhide.
+
+* Sat Feb 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.19-170.2.31
 - 2.6.27.19
 
 * Sat Feb 21 2009 Dave Airlie <airlied at redhat.com> 2.6.27.19-170-2.30.rc1




More information about the scm-commits mailing list