diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-01-10 11:54:07 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-01-10 11:54:07 -0500 |
| commit | ff9cb1c4eead5e4c292e75cd3170a82d66944101 (patch) | |
| tree | cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e /include/linux | |
| parent | e4e11180dfa545233e5145919b75b7fac88638df (diff) | |
| parent | d50f2ab6f050311dbf7b8f5501b25f0bf64a439b (diff) | |
Merge branch 'for_linus' into for_linus_merged
Conflicts:
fs/ext4/ioctl.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/jbd2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 2092ea21e469..5557baefed60 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
| @@ -1151,6 +1151,7 @@ extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); | |||
| 1151 | extern int jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t); | 1151 | extern int jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t); |
| 1152 | extern void jbd2_journal_clear_revoke(journal_t *); | 1152 | extern void jbd2_journal_clear_revoke(journal_t *); |
| 1153 | extern void jbd2_journal_switch_revoke_table(journal_t *journal); | 1153 | extern void jbd2_journal_switch_revoke_table(journal_t *journal); |
| 1154 | extern void jbd2_clear_buffer_revoked_flags(journal_t *journal); | ||
| 1154 | 1155 | ||
| 1155 | /* | 1156 | /* |
| 1156 | * The log thread user interface: | 1157 | * The log thread user interface: |