diff options
| author | Andrew Morton <akpm@osdl.org> | 2003-07-31 20:09:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-31 20:09:41 -0700 |
| commit | b84ee08e94334263cb96428542dfbcacca75072b (patch) | |
| tree | 0d8be0261283d6d33192292e4cc94c3fde13da0d | |
| parent | 01b1174f4de6f5b725002cbaa65aa4030225c5b7 (diff) | |
[PATCH] ext3: fix commit assertion failure
We're getting asserion failures in commit in data=journal mode.
journal_unmap_buffer() has unexpectedly donated this buffer to the committing
transaction, and the commit-time assertion doesn't expect that to happen. It
doesn't happen in 2.4 because both paths are under lock_journal().
Simply remove the assertion: the commit code will uncheckpoint the buffer and
then recheckpoint it if needed.
| -rw-r--r-- | fs/jbd/commit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 30c326330766..10845a511003 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -699,7 +699,6 @@ skip_commit: /* The journal should be unlocked by now. */ cp_transaction = jh->b_cp_transaction; if (cp_transaction) { JBUFFER_TRACE(jh, "remove from old cp transaction"); - J_ASSERT_JH(jh, commit_transaction != cp_transaction); __journal_remove_checkpoint(jh); } |