diff --git a/[refs] b/[refs]
index 6bd0a455e12d..175a1869a4a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf3a9d82adc62fb05e3f108ddd46eb088960f26
+refs/heads/master: aba54da3d05e910199ea8255992c244c9abadd91
diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c
index daff3341ff92..3a3cf225981f 100644
--- a/trunk/fs/jffs2/gc.c
+++ b/trunk/fs/jffs2/gc.c
@@ -838,6 +838,8 @@ static int jffs2_garbage_collect_deletion_dirent(struct jffs2_sb_info *c, struct
 
 		for (raw = f->inocache->nodes; raw != (void *)f->inocache; raw = raw->next_in_ino) {
 
+			cond_resched();
+
 			/* We only care about obsolete ones */
 			if (!(ref_obsolete(raw)))
 				continue;