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)
         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/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
         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)