aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-15 12:17:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-15 12:17:48 +0000
commite468c05d401b7b734e4e46e26f643d2d0af37d3d (patch)
tree3890088e731866a95107c48966bf385bc62348e4
parent7b7a99c771a09104793669ef1ffd5d9500bad067 (diff)
downloadupstream-e468c05d401b7b734e4e46e26f643d2d0af37d3d.tar.gz
upstream-e468c05d401b7b734e4e46e26f643d2d0af37d3d.tar.bz2
upstream-e468c05d401b7b734e4e46e26f643d2d0af37d3d.zip
generic/2.6.{29,30}: fix rootfs_split with squashfs4
SVN-Revision: 15867
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch27
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/066-rootfs_split_squashfs4_fix.patch27
2 files changed, 54 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 0000000000..f1766398cd
--- /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);
diff --git a/target/linux/generic-2.6/patches-2.6.30/066-rootfs_split_squashfs4_fix.patch b/target/linux/generic-2.6/patches-2.6.30/066-rootfs_split_squashfs4_fix.patch
new file mode 100644
index 0000000000..a968a57fac
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/066-rootfs_split_squashfs4_fix.patch
@@ -0,0 +1,27 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -538,21 +538,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);