From c91787ff3eeff8d1cf7bfebbbc49fd7657053e98 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <dedekind@infradead.org>
Date: Thu, 28 Dec 2006 12:01:41 +0200
Subject: [PATCH] --- yaml --- r: 45695 b: refs/heads/master c:
 a2166b933ef9099b4fa6860b165e6dac553a97aa h: refs/heads/master i:   45693:
 568039ba2a26fb51a66ac56eaf3f65bda050a8af   45691:
 5d6d8f1a76a7f2af82920bb34e26c7f9e1c9542c   45687:
 1d1e6800222d852d01e068fcde528d674a65dad5   45679:
 9008114bff1164ce74f98d2b90eeb363486005d0   45663:
 b20c5332668ff90c2654a839a1cf0cbc4f442dde   45631:
 561461626e9a3e74258be424ca626863a7638689   45567:
 7e365dd9da39b728c06fca40bcaba3b5cb47daf0 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/jffs2/scan.c    | 2 ++
 trunk/fs/jffs2/summary.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 53f730323fe0..854f384ca8d8 100644
--- 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
index a167e1c5d024..3af746eaff0e 100644
--- 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
index c4f7e4703c0a..25265965bdc1 100644
--- 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)