diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:37:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:37:40 -0400 |
| commit | a4277bf122e907e4fec509fc0bd9bf5fde30b14e (patch) | |
| tree | b359e8b0f7895acda1d6331332e69ea5b14d5f0d /include | |
| 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')
| -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 53ae4399da2d..c2049a04fa0b 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
| @@ -978,7 +978,8 @@ extern void journal_destroy_revoke(journal_t *); | |||
| 978 | extern int journal_revoke (handle_t *, | 978 | extern int journal_revoke (handle_t *, |
| 979 | unsigned long, struct buffer_head *); | 979 | unsigned long, struct buffer_head *); |
| 980 | extern int journal_cancel_revoke(handle_t *, struct journal_head *); | 980 | extern int journal_cancel_revoke(handle_t *, struct journal_head *); |
| 981 | extern void journal_write_revoke_records(journal_t *, transaction_t *); | 981 | extern void journal_write_revoke_records(journal_t *, |
| 982 | transaction_t *, int); | ||
| 982 | 983 | ||
| 983 | /* Recovery revoke support */ | 984 | /* Recovery revoke support */ |
| 984 | extern int journal_set_revoke(journal_t *, unsigned long, tid_t); | 985 | extern int journal_set_revoke(journal_t *, unsigned long, tid_t); |
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 8815a3456b3b..cc02393bfce8 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
| @@ -1193,7 +1193,8 @@ extern int jbd2_journal_init_revoke_caches(void); | |||
| 1193 | extern void jbd2_journal_destroy_revoke(journal_t *); | 1193 | extern void jbd2_journal_destroy_revoke(journal_t *); |
| 1194 | extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *); | 1194 | extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *); |
| 1195 | extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *); | 1195 | extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *); |
| 1196 | extern void jbd2_journal_write_revoke_records(journal_t *, transaction_t *); | 1196 | extern void jbd2_journal_write_revoke_records(journal_t *, |
| 1197 | transaction_t *, int); | ||
| 1197 | 1198 | ||
| 1198 | /* Recovery revoke support */ | 1199 | /* Recovery revoke support */ |
| 1199 | extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); | 1200 | extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); |