From: Jan Kara <jack@suse.cz>
Date: Thu, 2 Jun 2005 21:02:00 +0000 (-0700)
Subject: [PATCH] ext3: fix log_do_checkpoint() assertion failure
X-Git-Tag: v2.6.12-rc6~29
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ea81459c279f14a7b344320a71c94f60f88929;p=linux-2.6

[PATCH] ext3: fix log_do_checkpoint() assertion failure

Fix 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.

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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 98d830401c..58133ab945 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -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