aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-11-22 13:43:32 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-11-22 13:43:32 +0000
commit5ea6194ab0335f9c7351784b181bd3fd038fed47 (patch)
treebffe5acc557ca734671f310edd303acf11c7fc5b /target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch
parentd6ea3e24d49f94051305b5191edd10d213f92bf3 (diff)
downloadupstream-5ea6194ab0335f9c7351784b181bd3fd038fed47.tar.gz
upstream-5ea6194ab0335f9c7351784b181bd3fd038fed47.tar.bz2
upstream-5ea6194ab0335f9c7351784b181bd3fd038fed47.zip
remove 2.6.25 support
SVN-Revision: 24089
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.patch56
1 files changed, 0 insertions, 56 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
deleted file mode 100644
index eccdbe2f92..0000000000
--- a/target/linux/generic/patches-2.6.25/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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;
-