From 2962923afb7f938d4f001e7eb4234bd54f0f0c16 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 17 Apr 2006 00:19:48 +0100
Subject: [PATCH] --- yaml --- r: 27728 b: refs/heads/master c:
 d96fb997c6174f98a2a0a98200f99ac13b053bd6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 79108c17b975..fa771eb6b9cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6a82c94a9c69adfb6b9f6ce9f84be36884e471
+refs/heads/master: d96fb997c6174f98a2a0a98200f99ac13b053bd6
diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c
index f9ffece453a3..967fb2cf8e21 100644
--- a/trunk/fs/jffs2/gc.c
+++ b/trunk/fs/jffs2/gc.c
@@ -181,6 +181,10 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
 			   and trigger the BUG() above while we haven't yet
 			   finished checking all its nodes */
 			D1(printk(KERN_DEBUG "Waiting for ino #%u to finish reading\n", ic->ino));
+			/* We need to come back again for the _same_ inode. We've
+			 made no progress in this case, but that should be OK */
+			c->checked_ino--;
+
 			up(&c->alloc_sem);
 			sleep_on_spinunlock(&c->inocache_wq, &c->inocache_lock);
 			return 0;