From 7d6dd2ff13dae5fdf9481a078ea4c4b20a2b548d Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 23 Apr 2008 15:40:52 +0100
Subject: [PATCH] --- yaml --- r: 93072 b: refs/heads/master c:
 422b120238130307da64fa44c9fb722bfaf5f1af h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/jffs2/gc.c       | 8 +++++++-
 trunk/fs/jffs2/nodemgmt.c | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 400ea2ef7d26..84d85ce2cf45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2bc322bf05936ec7160d62bc3fd45cbf4aa405a
+refs/heads/master: 422b120238130307da64fa44c9fb722bfaf5f1af
diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c
index 26c7992c45ca..bad005664e30 100644
--- a/trunk/fs/jffs2/gc.c
+++ b/trunk/fs/jffs2/gc.c
@@ -221,7 +221,13 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
 		jeb = jffs2_find_gc_block(c);
 
 	if (!jeb) {
-		D1 (printk(KERN_NOTICE "jffs2: Couldn't find erase block to garbage collect!\n"));
+		/* Couldn't find a free block. But maybe we can just erase one and make 'progress'? */
+		if (!list_empty(&c->erase_pending_list)) {
+			spin_unlock(&c->erase_completion_lock);
+			mutex_unlock(&c->alloc_sem);
+			return -EAGAIN;
+		}
+		D1(printk(KERN_NOTICE "jffs2: Couldn't find erase block to garbage collect!\n"));
 		spin_unlock(&c->erase_completion_lock);
 		mutex_unlock(&c->alloc_sem);
 		return -EIO;
diff --git a/trunk/fs/jffs2/nodemgmt.c b/trunk/fs/jffs2/nodemgmt.c
index 747a73f0aa4d..9df8f3ef20df 100644
--- a/trunk/fs/jffs2/nodemgmt.c
+++ b/trunk/fs/jffs2/nodemgmt.c
@@ -116,7 +116,10 @@ int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
 			spin_unlock(&c->erase_completion_lock);
 
 			ret = jffs2_garbage_collect_pass(c);
-			if (ret)
+
+			if (ret == -EAGAIN)
+				jffs2_erase_pending_blocks(c, 1);
+			else if (ret)
 				return ret;
 
 			cond_resched();