Merge branch 'fix/pcm-jiffies-check' into fix/asoc

1 files changed, 12 insertions, 3 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index b45109c61fba..cc02393bfce8 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -308,7 +308,8 @@ void buffer_assertion_failure(struct buffer_head *bh);
                 int val = (expr);                                            \
                 if (!val) {                                                  \
                         printk(KERN_ERR                                      \
-                                "EXT3-fs unexpected failure: %s;\n",# expr); \
+                               "JBD2 unexpected failure: %s: %s;\n",         \
+                               __func__, #expr);                             \
                         printk(KERN_ERR why "\n");                           \
                 }                                                            \
                 val;                                                         \
@@ -648,6 +649,12 @@ struct transaction_s
         int t_handle_count;
 
         /*
+         * This transaction is being forced and some process is
+         * waiting for it to finish.
+         */
+        int t_synchronous_commit:1;
+
+        /*
          * For use by the filesystem to store fs-specific data
          * structures associated with the transaction
          */
@@ -1149,7 +1156,8 @@ extern int	   jbd2_journal_clear_err  (journal_t *);
 extern int         jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *);
 extern int         jbd2_journal_force_commit(journal_t *);
 extern int         jbd2_journal_file_inode(handle_t *handle, struct jbd2_inode *inode);
-extern int         jbd2_journal_begin_ordered_truncate(struct jbd2_inode *inode, loff_t new_size);
+extern int         jbd2_journal_begin_ordered_truncate(journal_t *journal,
+                                struct jbd2_inode *inode, loff_t new_size);
 extern void        jbd2_journal_init_jbd_inode(struct jbd2_inode *jinode, struct inode *inode);
 extern void        jbd2_journal_release_jbd_inode(journal_t *journal, struct jbd2_inode *jinode);
 
@@ -1185,7 +1193,8 @@ extern int	   jbd2_journal_init_revoke_caches(void);
 extern void        jbd2_journal_destroy_revoke(journal_t *);
 extern int         jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *);
 extern int         jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
-extern void        jbd2_journal_write_revoke_records(journal_t *, transaction_t *);
+extern void        jbd2_journal_write_revoke_records(journal_t *,
+                                                     transaction_t *, int);
 
 /* Recovery revoke support */
 extern int      jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t);