Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[~andy/linux] / include / linux / jbd.h

diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index c7acdde3243d6886391856c6ccd62261a4f8b9cf..d211732b9e99c8a6d95bff50b56505c651285a70 100644 (file)
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -497,7 +497,6 @@ struct transaction_s
  * @j_format_version: Version of the superblock format
  * @j_state_lock: Protect the various scalars in the journal
  * @j_barrier_count:  Number of processes waiting to create a barrier lock
- * @j_barrier: The barrier lock itself
  * @j_running_transaction: The current running transaction..
  * @j_committing_transaction: the transaction we are pushing to disk
  * @j_checkpoint_transactions: a linked circular list of all transactions
@@ -580,9 +579,6 @@ struct journal_s
         */
        int                     j_barrier_count;
 
-       /* The barrier lock itself */
-       struct mutex            j_barrier;
-
        /*
         * Transactions: The current running transaction...
         * [j_state_lock] [caller holding open handle]
@@ -913,6 +909,7 @@ extern int  journal_set_revoke(journal_t *, unsigned int, tid_t);
 extern int     journal_test_revoke(journal_t *, unsigned int, tid_t);
 extern void    journal_clear_revoke(journal_t *);
 extern void    journal_switch_revoke_table(journal_t *journal);
+extern void    journal_clear_buffer_revoked_flags(journal_t *journal);
 
 /*
  * The log thread user interface: