diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:42:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:42:58 +0000 |
| commit | da1bb88a2b900f0392b731ec47c5e1bff956fd8f (patch) | |
| tree | 597146471e3eeafb4ba55e802e80b896770808ff /target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch | |
| parent | 6117c04c9416b295347fb45c37e430f01df1d0d9 (diff) | |
| download | upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.tar.gz upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.tar.bz2 upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.zip | |
rename target/linux/generic-2.6 to generic
SVN-Revision: 21952
Diffstat (limited to 'target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch b/target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch new file mode 100644 index 0000000000..eccdbe2f92 --- /dev/null +++ b/target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch @@ -0,0 +1,56 @@ +--- a/fs/jffs2/build.c ++++ b/fs/jffs2/build.c +@@ -105,6 +105,17 @@ 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__); ++ if (c->mtd->unlock) ++ c->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 +@@ -142,9 +142,12 @@ 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)) ++ 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; +@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct + 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; + |