Commit 7c8903f6 authored by Mark Fasheh's avatar Mark Fasheh Committed by Linus Torvalds

[PATCH] jbd: revert checkpoint list changes

This patch reverts commit f93ea411:
  [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 8d3c7fce and
43c3e6f5 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: default avatarMark Fasheh <mark.fasheh@oracle.com>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be5efffb
This diff is collapsed.
...@@ -829,8 +829,7 @@ restart_loop: ...@@ -829,8 +829,7 @@ restart_loop:
journal->j_committing_transaction = NULL; journal->j_committing_transaction = NULL;
spin_unlock(&journal->j_state_lock); spin_unlock(&journal->j_state_lock);
if (commit_transaction->t_checkpoint_list == NULL && if (commit_transaction->t_checkpoint_list == NULL) {
commit_transaction->t_checkpoint_io_list == NULL) {
__journal_drop_transaction(journal, commit_transaction); __journal_drop_transaction(journal, commit_transaction);
} else { } else {
if (journal->j_checkpoint_transactions == NULL) { if (journal->j_checkpoint_transactions == NULL) {
......
...@@ -497,12 +497,6 @@ struct transaction_s ...@@ -497,12 +497,6 @@ struct transaction_s
*/ */
struct journal_head *t_checkpoint_list; struct journal_head *t_checkpoint_list;
/*
* Doubly-linked circular list of all buffers submitted for IO while
* checkpointing. [j_list_lock]
*/
struct journal_head *t_checkpoint_io_list;
/* /*
* Doubly-linked circular list of temporary buffers currently undergoing * Doubly-linked circular list of temporary buffers currently undergoing
* IO in the log [j_list_lock] * IO in the log [j_list_lock]
...@@ -852,7 +846,7 @@ extern void journal_commit_transaction(journal_t *); ...@@ -852,7 +846,7 @@ extern void journal_commit_transaction(journal_t *);
/* Checkpoint list management */ /* Checkpoint list management */
int __journal_clean_checkpoint_list(journal_t *journal); int __journal_clean_checkpoint_list(journal_t *journal);
int __journal_remove_checkpoint(struct journal_head *); void __journal_remove_checkpoint(struct journal_head *);
void __journal_insert_checkpoint(struct journal_head *, transaction_t *); void __journal_insert_checkpoint(struct journal_head *, transaction_t *);
/* Buffer IO */ /* Buffer IO */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment