diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:37:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:37:40 -0700 |
| commit | a4277bf122e907e4fec509fc0bd9bf5fde30b14e (patch) | |
| tree | b359e8b0f7895acda1d6331332e69ea5b14d5f0d /include/linux | |
| parent | 6ae85d6db4871d8dbcb5cc0e9056f97f1ca07061 (diff) | |
| parent | b5451f7b2694b04d9f912f6cf09db1729f291996 (diff) | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/jbd.h | 3 | ||||
| -rw-r--r-- | include/linux/jbd2.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 53ae4399da2..c2049a04fa0 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -978,7 +978,8 @@ extern void journal_destroy_revoke(journal_t *); extern int journal_revoke (handle_t *, unsigned long, struct buffer_head *); extern int journal_cancel_revoke(handle_t *, struct journal_head *); -extern void journal_write_revoke_records(journal_t *, transaction_t *); +extern void journal_write_revoke_records(journal_t *, + transaction_t *, int); /* Recovery revoke support */ extern int journal_set_revoke(journal_t *, unsigned long, tid_t); diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 8815a3456b3..cc02393bfce 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1193,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); |