diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /include/linux/jbd.h | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/jbd.h')
| -rw-r--r-- | include/linux/jbd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 593407e865b1..84321a4cac93 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
| @@ -914,7 +914,6 @@ extern int journal_wipe (journal_t *, int); | |||
| 914 | extern int journal_skip_recovery (journal_t *); | 914 | extern int journal_skip_recovery (journal_t *); |
| 915 | extern void journal_update_superblock (journal_t *, int); | 915 | extern void journal_update_superblock (journal_t *, int); |
| 916 | extern void __journal_abort_hard (journal_t *); | 916 | extern void __journal_abort_hard (journal_t *); |
| 917 | extern void __journal_abort_soft (journal_t *, int); | ||
| 918 | extern void journal_abort (journal_t *, int); | 917 | extern void journal_abort (journal_t *, int); |
| 919 | extern int journal_errno (journal_t *); | 918 | extern int journal_errno (journal_t *); |
| 920 | extern void journal_ack_err (journal_t *); | 919 | extern void journal_ack_err (journal_t *); |