summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2005-06-01 09:40:59 +0200
committerChris Wright <chrisw@osdl.org>2005-06-11 19:45:26 -0700
commit39dbf77a9f6acde730378c8b83879fc33ff4a596 (patch)
treec149d2ed7c899f21a33c3b37d4a57172f6b83311
parent7b692080506bdb5fc9cbb22bda2b247525515433 (diff)
downloadlinux-stable-39dbf77a9f6acde730378c8b83879fc33ff4a596.tar.gz
linux-stable-39dbf77a9f6acde730378c8b83879fc33ff4a596.tar.bz2
linux-stable-39dbf77a9f6acde730378c8b83879fc33ff4a596.zip
[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: Chris Wright <chrisw@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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)
}
} 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