[PATCH] Fix log_do_checkpoint() assertion failure

[Jan Kara <jack@suse.cz>]

  Hello,

  attached one liner fixes possible false assertion failure in
log_do_checkpoint(). We might fail to detect that we actually made a
progress when cleaning up the checkpoint lists if we don't retry after
writing something to disk. The patch was confirmed to fix observed
assertion failures for several users. Please apply.

								Honza

-- 
Jan Kara <jack@suse.cz>
SuSE CR Labs

When we flushed some buffers we need to retry scanning the list.
Otherwise we can fail to detect our progress.

Signed-off-by: Jan Kara <jack@suse.cz>

diff -rupX /home/jack/.kerndiffexclude linux-2.6.12-rc5/fs/jbd/checkpoint.c linux-2.6.12-rc5-1-checkretry/fs/jbd/checkpoint.c
--- linux-2.6.12-rc5/fs/jbd/checkpoint.c	2005-03-03 18:58:29.000000000 +0100
+++ linux-2.6.12-rc5-1-checkretry/fs/jbd/checkpoint.c	2005-05-27 11:15:31.000000000 +0200
@@ -339,8 +339,10 @@ int log_do_checkpoint(journal_t *journal
 			}
 		} while (jh != last_jh && !retry);
 
-		if (batch_count)
+		if (batch_count) {
 			__flush_batch(journal, bhs, &batch_count);
+			retry = 1;
+		}
 
 		/*
 		 * If someone cleaned up this transaction while we slept, we're