generic/2.6.{29,30}: fix rootfs_split with squashfs4

SVN-Revision: 15867

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 (file)
index 0000000..f176639
--- /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 (file)
index 0000000..a968a57
--- /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);