diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-05-15 12:17:48 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-05-15 12:17:48 +0000 |
| commit | 4de240063888ea5e885565e92d71b7cb48050497 (patch) | |
| tree | 8d44395adaf3762b47139cddc52020b194af2a18 | |
| parent | 80f719bd9179feed1f25f11ce21dc8230120d95c (diff) | |
| download | master-187ad058-4de240063888ea5e885565e92d71b7cb48050497.tar.gz master-187ad058-4de240063888ea5e885565e92d71b7cb48050497.tar.bz2 master-187ad058-4de240063888ea5e885565e92d71b7cb48050497.zip | |
[kernel] generic/2.6.{29,30}: fix rootfs_split with squashfs4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15867 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch | 27 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/066-rootfs_split_squashfs4_fix.patch | 27 |
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); |