Merge branch 'master'

[linux-2.6-omap-h63xx.git] / include / linux / jbd.h

diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index dcde7adfdce51ac2104299dac232defc62267346..558cb4c26ec9ee6c1d6f8daab784f8bc497fba84 100644 (file)
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -497,6 +497,12 @@ struct transaction_s
         */
        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
         * IO in the log [j_list_lock]
@@ -843,7 +849,7 @@ extern void journal_commit_transaction(journal_t *);
 
 /* Checkpoint list management */
 int __journal_clean_checkpoint_list(journal_t *journal);
-void __journal_remove_checkpoint(struct journal_head *);
+int __journal_remove_checkpoint(struct journal_head *);
 void __journal_insert_checkpoint(struct journal_head *, transaction_t *);
 
 /* Buffer IO */