aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
blob: 9f248c93dd825540d0e3dff9da96e7deb375577b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
diff -urN linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
--- linux.old/fs/jffs2/build.c	2006-06-18 03:49:35.000000000 +0200
+++ linux.dev/fs/jffs2/build.c	2006-06-23 21:46:48.000000000 +0200
@@ -107,6 +107,17 @@
 	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. */
diff -urN linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
--- linux.old/fs/jffs2/scan.c	2006-06-23 21:39:38.000000000 +0200
+++ linux.dev/fs/jffs2/scan.c	2006-06-23 21:42:18.000000000 +0200
@@ -119,9 +119,12 @@
 
 		/* 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;
@@ -389,6 +392,17 @@
 			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;