1 --- a/drivers/mtd/mtdpart.c
2 +++ b/drivers/mtd/mtdpart.c
3 @@ -670,43 +670,16 @@ mtd_pad_erasesize(struct mtd_info *mtd,
7 -#define ROOTFS_SPLIT_NAME "rootfs_data"
9 -struct squashfs_super_block {
16 static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
18 - struct squashfs_super_block sb;
19 + size_t squashfs_len;
22 - ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
23 - if (ret || (len != sizeof(sb))) {
24 - printk(KERN_ALERT "split_squashfs: error occured while reading "
25 - "from \"%s\"\n", master->name);
29 - if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
30 - printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
36 - if (le64_to_cpu((sb.bytes_used)) <= 0) {
37 - printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
42 + ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
46 - len = (u32) le64_to_cpu(sb.bytes_used);
47 - len = mtd_pad_erasesize(master, offset, len);
48 + len = mtd_pad_erasesize(master, offset, squashfs_len);
49 *split_offset = offset + len;
52 --- a/drivers/mtd/Kconfig
53 +++ b/drivers/mtd/Kconfig
54 @@ -20,6 +20,7 @@ config MTD_ROOTFS_ROOT_DEV
56 config MTD_ROOTFS_SPLIT
57 bool "Automatically split 'rootfs' partition for squashfs"
61 config MTD_SPLIT_FIRMWARE