aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-06 01:40:12 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 10:41:20 -0800
commit533083836fd55ca67ce35ab3d914b74ec1a5b9a8 (patch)
tree5dffe25ff6d049be33ffe6b3d0135cae45eb2a72
parente86e14385d8473a71809ff5c2be4b06867af4b5e (diff)
downloadkernel_samsung_smdk4412-533083836fd55ca67ce35ab3d914b74ec1a5b9a8.zip
kernel_samsung_smdk4412-533083836fd55ca67ce35ab3d914b74ec1a5b9a8.tar.gz
kernel_samsung_smdk4412-533083836fd55ca67ce35ab3d914b74ec1a5b9a8.tar.bz2
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.c2
-rw-r--r--include/linux/jbd.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 5d14243..3943a89 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 d9ecd13..59b94c3 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 *);