aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-09-21 11:25:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-09-21 11:25:17 +0000
commit4296e978da0ab4198aa7f3d823690ee452e300c6 (patch)
treea5e666785df63064d1322e25030732622082b073 /target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
parente5dc717d220534bd61ee53c010ad050f648170c3 (diff)
downloadupstream-4296e978da0ab4198aa7f3d823690ee452e300c6.tar.gz
upstream-4296e978da0ab4198aa7f3d823690ee452e300c6.tar.bz2
upstream-4296e978da0ab4198aa7f3d823690ee452e300c6.zip
rename generic-2.6/patches to generic-2.6/patches-2.6.21
SVN-Revision: 12636
Diffstat (limited to 'target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch')
-rw-r--r--target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
deleted file mode 100644
index 5c301b47d2..0000000000
--- a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: linux-2.6.21.7/fs/jffs2/build.c
-===================================================================
---- linux-2.6.21.7.orig/fs/jffs2/build.c
-+++ linux-2.6.21.7/fs/jffs2/build.c
-@@ -107,6 +107,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. */
-Index: linux-2.6.21.7/fs/jffs2/scan.c
-===================================================================
---- linux-2.6.21.7.orig/fs/jffs2/scan.c
-+++ linux-2.6.21.7/fs/jffs2/scan.c
-@@ -143,9 +143,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;
-@@ -546,6 +549,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;
-