---

yaml --- r: 45695 b: refs/heads/master c: a2166b9 h: refs/heads/master i: 45693: 568039b 45691: 5d6d8f1 45687: 1d1e680 45679: 9008114 45663: b20c533 45631: 5614616 45567: 7e365dd v: v3
git-mirror · Jan 10, 2007 · c91787f · c91787f
1 parent c0ef364
commit c91787f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85de3d9bc779c198f8667cffc291b0ecad082b5e
+refs/heads/master: a2166b933ef9099b4fa6860b165e6dac553a97aa
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
@@ -139,6 +139,8 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 	for (i=0; i<c->nr_blocks; i++) {
 		struct jffs2_eraseblock *jeb = &c->blocks[i];
 
+		cond_resched();
+
 		/* reset summary info for next eraseblock scan */
 		jffs2_sum_reset_collected(s);
 

diff --git a/trunk/fs/jffs2/summary.c b/trunk/fs/jffs2/summary.c
@@ -396,6 +396,8 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras
 	for (i=0; i<je32_to_cpu(summary->sum_num); i++) {
 		dbg_summary("processing summary index %d\n", i);
 
+		cond_resched();
+
 		/* Make sure there's a spare ref for dirty space */
 		err = jffs2_prealloc_raw_node_refs(c, jeb, 2);
 		if (err)