Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Fix potential inode allocation soft lockup in Orlov allocator
  ext4: Make the extent validity check more paranoid
  jbd: use SWRITE_SYNC_PLUG when writing synchronous revoke records
  jbd2: use SWRITE_SYNC_PLUG when writing synchronous revoke records
  ext4: really print the find_group_flex fallback warning only once

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/jbd/revoke.c
index 3e9afc2a91d2eca02609ff9d0fd884c26bf207e1,1b1a06e1c83616f55b4017fecccf7a8065c64420..da6cd9bdaabcaf562006bb3523cd6f5bc0b0ca52
--- 1/fs/jbd/revoke.c
--- 2/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@@ -498,9 -482,12 +499,9 @@@ void journal_switch_revoke_table(journa
  /*
   * Write revoke records to the journal for all entries in the current
   * revoke hash, deleting the entries as we go.
 - *
 - * Called with the journal lock held.
   */
 -
  void journal_write_revoke_records(journal_t *journal,
-                                 transaction_t *transaction)
+                                 transaction_t *transaction, int write_op)
  {
        struct journal_head *descriptor;
        struct jbd_revoke_record_s *record;