summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch
diff options
context:
space:
mode:
authorhcg <hcg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-28 10:00:48 +0000
committerhcg <hcg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-28 10:00:48 +0000
commitc5a9834bb42c45e2bd0873fa409cb8e7ea7badf2 (patch)
tree6527b3196b8418cb3359748a798c79644d18faf8 /target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch
parentc57c9b688ba29ea6ef6cb05a25a245c002d53949 (diff)
[kernel] revert 15922 - add back 2.6.29 kernel support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch b/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch
new file mode 100644
index 000000000..f1766398c
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch
@@ -0,0 +1,27 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -515,21 +515,21 @@ static int split_squashfs(struct mtd_inf
+ return -EINVAL;
+ }
+
+- if (*((u32 *) buf) != SQUASHFS_MAGIC) {
++ if (SQUASHFS_MAGIC != le32_to_cpu(sb->s_magic) ) {
+ printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
+ master->name);
+ *split_offset = 0;
+ return 0;
+ }
+
+- if (sb->bytes_used <= 0) {
++ if (le64_to_cpu((sb->bytes_used)) <= 0) {
+ printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
+ master->name);
+ *split_offset = 0;
+ return 0;
+ }
+
+- len = (u32) sb->bytes_used;
++ len = (u32) le64_to_cpu(sb->bytes_used);
+ len += (offset & 0x000fffff);
+ len += (master->erasesize - 1);
+ len &= ~(master->erasesize - 1);