diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /include/linux/jbd.h | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'include/linux/jbd.h')
| -rw-r--r-- | include/linux/jbd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 35d4f6342fac..346e2b80be7d 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
| @@ -911,7 +911,7 @@ extern int journal_set_features | |||
| 911 | (journal_t *, unsigned long, unsigned long, unsigned long); | 911 | (journal_t *, unsigned long, unsigned long, unsigned long); |
| 912 | extern int journal_create (journal_t *); | 912 | extern int journal_create (journal_t *); |
| 913 | extern int journal_load (journal_t *journal); | 913 | extern int journal_load (journal_t *journal); |
| 914 | extern void journal_destroy (journal_t *); | 914 | extern int journal_destroy (journal_t *); |
| 915 | extern int journal_recover (journal_t *journal); | 915 | extern int journal_recover (journal_t *journal); |
| 916 | extern int journal_wipe (journal_t *, int); | 916 | extern int journal_wipe (journal_t *, int); |
| 917 | extern int journal_skip_recovery (journal_t *); | 917 | extern int journal_skip_recovery (journal_t *); |