diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-02-14 13:53:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-14 16:09:34 -0800 |
| commit | 7c8903f6373f9abecf060bad53ca36bc4ac037f2 (patch) | |
| tree | 473644b1f2999e3e516cd4f55a3535d9bb29595d /fs/jbd/commit.c | |
| parent | be5efffb762fa4a7b9a7a45ebf34b13e3bf5a2d8 (diff) | |
| download | kernel_samsung_smdk4412-7c8903f6373f9abecf060bad53ca36bc4ac037f2.zip kernel_samsung_smdk4412-7c8903f6373f9abecf060bad53ca36bc4ac037f2.tar.gz kernel_samsung_smdk4412-7c8903f6373f9abecf060bad53ca36bc4ac037f2.tar.bz2 | |
[PATCH] jbd: revert checkpoint list changes
This patch reverts commit f93ea411b73594f7d144855fd34278bcf34a9afc:
[PATCH] jbd: split checkpoint lists
This broke journal_flush() for OCFS2, which is its method of being sure
that metadata is sent to disk for another node.
And two related commits 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b and
43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 with the subjects:
[PATCH] jbd: log_do_checkpoint fix
[PATCH] jbd: remove_transaction fix
These seem to be incremental bugfixes on the original patch and as such are
no longer needed.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/jbd/commit.c')
| -rw-r--r-- | fs/jbd/commit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 29e62d9..002ad2b 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -829,8 +829,7 @@ restart_loop: journal->j_committing_transaction = NULL; spin_unlock(&journal->j_state_lock); - if (commit_transaction->t_checkpoint_list == NULL && - commit_transaction->t_checkpoint_io_list == NULL) { + if (commit_transaction->t_checkpoint_list == NULL) { __journal_drop_transaction(journal, commit_transaction); } else { if (journal->j_checkpoint_transactions == NULL) { |