aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-09-08 19:55:36 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-09-08 19:55:36 +0000
commit54cd991725079fdce550e86f2303ece870203386 (patch)
treeef26822511b5dfe4eba238e4a9f0665bc99201e7 /target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch
parenteea3a89a6a158dda4751802d952ddc07408c1b0a (diff)
downloadupstream-54cd991725079fdce550e86f2303ece870203386.tar.gz
upstream-54cd991725079fdce550e86f2303ece870203386.tar.bz2
upstream-54cd991725079fdce550e86f2303ece870203386.zip
kernel: drop 3.9 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 42452
Diffstat (limited to 'target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch')
-rw-r--r--target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch b/target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch
deleted file mode 100644
index f36131e99f..0000000000
--- a/target/linux/generic/patches-3.9/532-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -114,6 +114,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,11 @@ 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;
-@@ -556,6 +559,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;
- max_ofs = EMPTY_SCAN_SIZE(c->sector_size);