From: Adrian Bunk Date: Wed, 6 Feb 2008 09:40:12 +0000 (-0800) Subject: make jbd/journal.c:__journal_abort_hard() static X-Git-Tag: v2.6.25-rc1~531 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=533083836fd55ca67ce35ab3d914b74ec1a5b9a8;p=linux-2.6 make jbd/journal.c:__journal_abort_hard() static __journal_abort_hard() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 5d14243499..3943a8905e 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) * Aborts hard --- we mark the abort as occurred, but do _nothing_ else, * and don't attempt to make any other journal updates. */ -void __journal_abort_hard(journal_t *journal) +static void __journal_abort_hard(journal_t *journal) { transaction_t *transaction; char b[BDEVNAME_SIZE]; diff --git a/include/linux/jbd.h b/include/linux/jbd.h index d9ecd13393..59b94c3e6c 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -924,7 +924,6 @@ extern int journal_recover (journal_t *journal); extern int journal_wipe (journal_t *, int); extern int journal_skip_recovery (journal_t *); extern void journal_update_superblock (journal_t *, int); -extern void __journal_abort_hard (journal_t *); extern void journal_abort (journal_t *, int); extern int journal_errno (journal_t *); extern void journal_ack_err (journal_t *);