1831966406
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.95 Removed upstreamed: backport-6.6/201-v6.16-mips-Add-std-flag-specified.patch[1] mvebu/patches-6.6/0004-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch[2] mvebu/patches-6.6/0005-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch[3] mvebu/patches-6.6/0006-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch[4] mvebu/patches-6.6/0007-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch[5] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.95&id=231f6a1de15b3f62eb8d6163a8b1bc5935025c69 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.95&id=ae48bc0b8be8786fd0ceab4b5a95c09b5aa93816 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.95&id=8a15a5438c5816a1003b88ce20f25ccc92909ee7 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.95&id=02c966a8869becb29282403540c88ba33e19c347 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.95&id=14a26f6692062a529b612420adb6c0b9290b25d3 Build system: x86/64 Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19248 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: fs: jffs2: EOF marker
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
fs/jffs2/build.c | 10 ++++++++++
|
|
fs/jffs2/scan.c | 21 +++++++++++++++++++--
|
|
2 files changed, 29 insertions(+), 2 deletions(-)
|
|
|
|
--- a/fs/jffs2/build.c
|
|
+++ b/fs/jffs2/build.c
|
|
@@ -117,6 +117,16 @@ static int jffs2_build_filesystem(struct
|
|
dbg_fsbuild("scanned flash completely\n");
|
|
jffs2_dbg_dump_block_lists_nolock(c);
|
|
|
|
+ if (c->flags & (1 << 7)) {
|
|
+ printk("%s(): unlocking the mtd device... ", __func__);
|
|
+ mtd_unlock(c->mtd, 0, c->mtd->size);
|
|
+ printk("done.\n");
|
|
+
|
|
+ printk("%s(): erasing all blocks after the end marker... ", __func__);
|
|
+ jffs2_erase_pending_blocks(c, -1);
|
|
+ printk("done.\n");
|
|
+ }
|
|
+
|
|
dbg_fsbuild("pass 1 starting\n");
|
|
c->flags |= JFFS2_SB_FLAG_BUILDING;
|
|
/* Now scan the directory tree, increasing nlink according to every dirent found. */
|
|
--- a/fs/jffs2/scan.c
|
|
+++ b/fs/jffs2/scan.c
|
|
@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
|
|
/* reset summary info for next eraseblock scan */
|
|
jffs2_sum_reset_collected(s);
|
|
|
|
- ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
|
|
- buf_size, s);
|
|
+ if (c->flags & (1 << 7)) {
|
|
+ if (mtd_block_isbad(c->mtd, jeb->offset))
|
|
+ ret = BLK_STATE_BADBLOCK;
|
|
+ else
|
|
+ ret = BLK_STATE_ALLFF;
|
|
+ } else
|
|
+ ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
|
|
+ buf_size, s);
|
|
|
|
if (ret < 0)
|
|
goto out;
|
|
@@ -569,6 +575,17 @@ full_scan:
|
|
return err;
|
|
}
|
|
|
|
+ if ((buf[0] == 0xde) &&
|
|
+ (buf[1] == 0xad) &&
|
|
+ (buf[2] == 0xc0) &&
|
|
+ (buf[3] == 0xde)) {
|
|
+ /* end of filesystem. erase everything after this point */
|
|
+ printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
|
|
+ c->flags |= (1 << 7);
|
|
+
|
|
+ return BLK_STATE_ALLFF;
|
|
+ }
|
|
+
|
|
/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
|
|
ofs = 0;
|
|
max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
|