From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2009 15:37:40 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v3.0~9394
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4277bf122e907e4fec509fc0bd9bf5fde30b14e;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for_linus' of git://git./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
---

a4277bf122e907e4fec509fc0bd9bf5fde30b14e
diff --cc fs/jbd/revoke.c
index 3e9afc2,1b1a06e..da6cd9b
--- a/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;