KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: mtdsplit: document Seama splitter a bit

Browse source 
Rename kernel_size variable as it includes whole entity size, not just a
kernel size. Also update comments to match it and describe better what
are we checking/looking for.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 48480
This commit is contained in:
Rafał Miłecki 2016-01-25 07:18:47 +00:00
parent 4e14a27799
commit 02abeb3b0a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seama.c
View file

@ -33,7 +33,7 @@ static int mtdsplit_parse_seama(struct mtd_info *master,
struct mtd_part_parser_data *data)
{
struct seama_header hdr;
size_t hdr_len, retlen, kernel_size;
size_t hdr_len, retlen, kernel_ent_size;
size_t rootfs_offset;
struct mtd_partition *parts;
int err;
@ -50,18 +50,20 @@ static int mtdsplit_parse_seama(struct mtd_info *master,
if (be32_to_cpu(hdr.magic) != SEAMA_MAGIC)
return -EINVAL;
kernel_size = hdr_len + be32_to_cpu(hdr.size) +
be16_to_cpu(hdr.metasize);
if (kernel_size > master->size)
kernel_ent_size = hdr_len + be32_to_cpu(hdr.size) +
be16_to_cpu(hdr.metasize);
if (kernel_ent_size > master->size)
return -EINVAL;
/* Find the rootfs after the kernel. */
err = mtd_check_rootfs_magic(master, kernel_size);
/* Check for the rootfs right after Seama entity with a kernel. */
err = mtd_check_rootfs_magic(master, kernel_ent_size);
if (!err) {
rootfs_offset = kernel_size;
rootfs_offset = kernel_ent_size;
} else {
/*
* The size in the header might cover the rootfs as well.
* On some devices firmware entity might contain both: kernel
* and rootfs. We can't determine kernel size so we just have to
* look for rootfs magic.
* Start the search from an arbitrary offset.
*/
err = mtd_find_rootfs_from(master, SEAMA_MIN_ROOTFS_OFFS,