Merge branch 'jk/jbd2-revoke-overflow'

diff --cc fs/ext4/ext4.h
Simple merge

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

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

diff --cc fs/jbd2/commit.c
Simple merge

diff --cc fs/jbd2/journal.c
Simple merge

diff --cc fs/jbd2/transaction.c
index 7c11afe60532003b5f9ec13e216a20962677d022,a9d3a2208506a2e568f8270397c7c26db754160f..c068912408dd52a28a69b1ee56909bfb4efb6e49
--- 1/fs/jbd2/transaction.c
--- 2/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@@ -1665,15 -1737,20 +1736,15 @@@ int jbd2_journal_forget (handle_t *hand
                __jbd2_journal_file_buffer(jh, transaction, BJ_Forget);
                spin_unlock(&journal->j_list_lock);
        }
 -
 -      jbd_unlock_bh_state(bh);
 -      __brelse(bh);
  drop:
 +      __brelse(bh);
 +      spin_unlock(&jh->b_state_lock);
 +      jbd2_journal_put_journal_head(jh);
        if (drop_reserve) {
                /* no need to reserve log space for this block -bzzz */
-               handle->h_buffer_credits++;
+               handle->h_total_credits++;
        }
        return err;
 -
 -not_jbd:
 -      jbd_unlock_bh_state(bh);
 -      __bforget(bh);
 -      goto drop;
  }
  
  /**

diff --cc include/linux/jbd2.h
Simple merge