aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd/checkpoint.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2005-06-02 17:02:00 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-02 18:12:29 -0400
commit00ea81459c279f14a7b344320a71c94f60f88929 (patch)
treeb68c067a416e7c303823a1f7477daa9f05b37819 /fs/jbd/checkpoint.c
parent1e86d1c648508fd50e6c9960576b87906a7906ad (diff)
[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>
Diffstat (limited to 'fs/jbd/checkpoint.c')
-rw-r--r--fs/jbd/checkpoint.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 98d830401c56..58133ab9457e 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -339,8 +339,10 @@ int log_do_checkpoint(journal_t *journal)
339 } 339 }
340 } while (jh != last_jh && !retry); 340 } while (jh != last_jh && !retry);
341 341
342 if (batch_count) 342 if (batch_count) {
343 __flush_batch(journal, bhs, &batch_count); 343 __flush_batch(journal, bhs, &batch_count);
344 retry = 1;
345 }
344 346
345 /* 347 /*
346 * If someone cleaned up this transaction while we slept, we're 348 * If someone cleaned up this transaction while we slept, we're