aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorArtem Bityutskiy <dedekind@infradead.org>2006-12-28 05:01:41 -0500
committerArtem Bityutskiy <dedekind@infradead.org>2007-01-10 07:01:00 -0500
commita2166b933ef9099b4fa6860b165e6dac553a97aa (patch)
tree6b9828492a1edb156e981082b931f16f832baa1f /fs
parent85de3d9bc779c198f8667cffc291b0ecad082b5e (diff)
[JFFS2] Reschedule in loops
Make JFFS2 nicer and teach it to call cond_resched() in loops which may be quite large. Signed-off-by: Artem Bityutskiy <dedekind@infradead.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/scan.c2
-rw-r--r--fs/jffs2/summary.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index a167e1c5d024..3af746eaff0e 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -139,6 +139,8 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
139 for (i=0; i<c->nr_blocks; i++) { 139 for (i=0; i<c->nr_blocks; i++) {
140 struct jffs2_eraseblock *jeb = &c->blocks[i]; 140 struct jffs2_eraseblock *jeb = &c->blocks[i];
141 141
142 cond_resched();
143
142 /* reset summary info for next eraseblock scan */ 144 /* reset summary info for next eraseblock scan */
143 jffs2_sum_reset_collected(s); 145 jffs2_sum_reset_collected(s);
144 146
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index c4f7e4703c0a..25265965bdc1 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -396,6 +396,8 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras
396 for (i=0; i<je32_to_cpu(summary->sum_num); i++) { 396 for (i=0; i<je32_to_cpu(summary->sum_num); i++) {
397 dbg_summary("processing summary index %d\n", i); 397 dbg_summary("processing summary index %d\n", i);
398 398
399 cond_resched();
400
399 /* Make sure there's a spare ref for dirty space */ 401 /* Make sure there's a spare ref for dirty space */
400 err = jffs2_prealloc_raw_node_refs(c, jeb, 2); 402 err = jffs2_prealloc_raw_node_refs(c, jeb, 2);
401 if (err) 403 if (err)