hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-13 16:12:09 -05:00
Code Issues Projects Releases Wiki Activity

Revert "kernel: mtdsplit_h3c_vfs: return 0 for non-fatal errors"

Browse Source 
This reverts commit 6fa1775348.

Skipping parser for subpartition will be handled now with -ENOENT.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2025-11-20 23:22:30 +01:00
parent e9ae6b19f0
commit 728ca2bc39
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_h3c_vfs.c
View File

@ -98,11 +98,8 @@ static int mtdsplit_h3c_vfs_parse(struct mtd_info *mtd,
if (retlen != sizeof(format_flag)) if (retlen != sizeof(format_flag))
return -EIO; return -EIO;
if (format_flag != FORMAT_FLAG) { if (format_flag != FORMAT_FLAG)
pr_info("mtdsplit_h3c_vfs: unexpected format flag %08x\n", return -EINVAL;
format_flag);
return 0;
}
/* Check file entry */ /* Check file entry */
err = mtd_read(mtd, FILE_ENTRY_OFFSET, sizeof(file_entry), &retlen, err = mtd_read(mtd, FILE_ENTRY_OFFSET, sizeof(file_entry), &retlen,
@ -113,14 +110,20 @@ static int mtdsplit_h3c_vfs_parse(struct mtd_info *mtd,
if (retlen != sizeof(file_entry)) if (retlen != sizeof(file_entry))
return -EIO; return -EIO;
if (file_entry.flags != FILE_ENTRY_FLAGS || if (file_entry.flags != FILE_ENTRY_FLAGS)
file_entry.parent_block != FILE_ENTRY_PARENT_BLOCK || return -EINVAL;
file_entry.parent_index != FILE_ENTRY_PARENT_INDEX ||
file_entry.data_block != FILE_ENTRY_DATA_BLOCK || if (file_entry.parent_block != FILE_ENTRY_PARENT_BLOCK)
strncmp(file_entry.name, FILE_ENTRY_NAME, sizeof(file_entry.name)) != 0) { return -EINVAL;
pr_info("mtdsplit_h3c_vfs: unexpected file entry - OpenWrt probably not installed\n");
return 0; if (file_entry.parent_index != FILE_ENTRY_PARENT_INDEX)
} return -EINVAL;
if (file_entry.data_block != FILE_ENTRY_DATA_BLOCK)
return -EINVAL;
if (strncmp(file_entry.name, FILE_ENTRY_NAME, sizeof(file_entry.name)) != 0)
return -EINVAL;
/* Find rootfs offset */ /* Find rootfs offset */
kernel_size = block_offset(file_entry.data_block + kernel_size = block_offset(file_entry.data_block +