rpms/kernel/F-11 squashfs-broken-when-pageszie-greater-than-blocksize.patch, NONE, 1.1 TODO, 1.63, 1.64 config-generic, 1.274, 1.275 kernel.spec, 1.1540, 1.1541

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	TODO config-generic kernel.spec 
Added Files:
	squashfs-broken-when-pageszie-greater-than-blocksize.patch 
Log Message:
* Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
- Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)


squashfs-broken-when-pageszie-greater-than-blocksize.patch:

--- NEW FILE squashfs-broken-when-pageszie-greater-than-blocksize.patch ---
From: Doug Chapman <doug.chapman at hp.com>
To: fedora-kernel-list at redhat.com
Subject: [PATCH] squashfs broken when pageszie > blocksize

Not sure if we are too late for F11 on this or not but this patch
is needed to be able to mount squashfs (as used by anaconda) on
ia64.  Our goal is to be able to build Fedora on ia64 with no
custom SRPMs so it would be appreciated if this could be pulled
in.

--------------------

Squashfs is broken on any system where the pageszie is larger than either
the block size of the squashfs image or larger than the metadata size (8192).
This is easily fixed by ensuring cache->pages is always > 0.

Signed-off-by: Doug Chapman <doug.chapman at hp.com>
Cc: Phillip Lougher <phillip at lougher.demon.co.uk>

---
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 1c4739e..40c98fa 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -252,6 +252,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,
 	cache->entries = entries;
 	cache->block_size = block_size;
 	cache->pages = block_size >> PAGE_CACHE_SHIFT;
+	cache->pages = cache->pages ? cache->pages : 1;
 	cache->name = name;
 	cache->num_waiters = 0;
 	spin_lock_init(&cache->lock);


_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- TODO	8 Apr 2009 21:38:33 -0000	1.63
+++ TODO	14 Apr 2009 14:13:40 -0000	1.64
@@ -68,8 +68,11 @@
 	jarod working on upstreaming
 
 * drm-intel-lying-systems-without-lvds.patch
+	will be used as a fallback for 2.6.30 if vbios probing doesn't
+	pan out in time, may go to 2.6.29.x at some point (jarod's doing)
 * linux-2.6-acer-wmi-bail-on-aao.patch
-	jarod will send upstream shortly (so says he, on 20090303)
+	suck. something similar-but-less-pretty merged upstream on 20090304,
+	a day after I (jarod) wrote my version... Headed to stable too.
 
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- config-generic	13 Apr 2009 18:35:55 -0000	1.274
+++ config-generic	14 Apr 2009 14:13:40 -0000	1.275
@@ -3294,6 +3294,7 @@
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1540
retrieving revision 1.1541
diff -u -r1.1540 -r1.1541
--- kernel.spec	14 Apr 2009 14:09:13 -0000	1.1540
+++ kernel.spec	14 Apr 2009 14:13:40 -0000	1.1541
@@ -721,6 +721,8 @@
 # patches headed for -stable
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+# fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
+Patch6010: squashfs-broken-when-pageszie-greater-than-blocksize.patch
 # fix duplicated flags value
 Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 # fix posix clock monotonicity
@@ -1350,6 +1352,7 @@
 
 # patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+ApplyPatch squashfs-broken-when-pageszie-greater-than-blocksize.patch
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
@@ -1950,6 +1953,9 @@
 # and build.
 
 %changelog
+* Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
+- Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - Add missing patch for broken RLIMIT_CPU