diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-06 04:40:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:20 -0500 |
commit | 533083836fd55ca67ce35ab3d914b74ec1a5b9a8 (patch) | |
tree | 5dffe25ff6d049be33ffe6b3d0135cae45eb2a72 | |
parent | e86e14385d8473a71809ff5c2be4b06867af4b5e (diff) |
make jbd/journal.c:__journal_abort_hard() static
__journal_abort_hard() can now become static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/jbd/journal.c | 2 | ||||
-rw-r--r-- | include/linux/jbd.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 5d14243499d4..3943a8905eb2 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -1457,7 +1457,7 @@ static const char *journal_dev_name(journal_t *journal, char *buffer) | |||
1457 | * Aborts hard --- we mark the abort as occurred, but do _nothing_ else, | 1457 | * Aborts hard --- we mark the abort as occurred, but do _nothing_ else, |
1458 | * and don't attempt to make any other journal updates. | 1458 | * and don't attempt to make any other journal updates. |
1459 | */ | 1459 | */ |
1460 | void __journal_abort_hard(journal_t *journal) | 1460 | static void __journal_abort_hard(journal_t *journal) |
1461 | { | 1461 | { |
1462 | transaction_t *transaction; | 1462 | transaction_t *transaction; |
1463 | char b[BDEVNAME_SIZE]; | 1463 | char b[BDEVNAME_SIZE]; |
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index d9ecd13393b0..59b94c3e6c24 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -924,7 +924,6 @@ extern int journal_recover (journal_t *journal); | |||
924 | extern int journal_wipe (journal_t *, int); | 924 | extern int journal_wipe (journal_t *, int); |
925 | extern int journal_skip_recovery (journal_t *); | 925 | extern int journal_skip_recovery (journal_t *); |
926 | extern void journal_update_superblock (journal_t *, int); | 926 | extern void journal_update_superblock (journal_t *, int); |
927 | extern void __journal_abort_hard (journal_t *); | ||
928 | extern void journal_abort (journal_t *, int); | 927 | extern void journal_abort (journal_t *, int); |
929 | extern int journal_errno (journal_t *); | 928 | extern int journal_errno (journal_t *); |
930 | extern void journal_ack_err (journal_t *); | 929 | extern void journal_ack_err (journal_t *); |