mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
[PATCH] fs/jbd/: cleanups
This patch contains the following cleanups: - make needlessly global functions static - journal.c: remove the unused global function __journal_internal_check and move the check to journal_init - remove the following write-only global variable: - journal.c: current_journal - remove the following unneeded EXPORT_SYMBOL: - journal.c: journal_recover Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
202e5979af
commit
022a4a7bbd
3 changed files with 16 additions and 22 deletions
|
@ -65,7 +65,6 @@ EXPORT_SYMBOL(journal_set_features);
|
|||
EXPORT_SYMBOL(journal_create);
|
||||
EXPORT_SYMBOL(journal_load);
|
||||
EXPORT_SYMBOL(journal_destroy);
|
||||
EXPORT_SYMBOL(journal_recover);
|
||||
EXPORT_SYMBOL(journal_update_superblock);
|
||||
EXPORT_SYMBOL(journal_abort);
|
||||
EXPORT_SYMBOL(journal_errno);
|
||||
|
@ -81,6 +80,7 @@ EXPORT_SYMBOL(journal_try_to_free_buffers);
|
|||
EXPORT_SYMBOL(journal_force_commit);
|
||||
|
||||
static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *);
|
||||
static void __journal_abort_soft (journal_t *journal, int errno);
|
||||
|
||||
/*
|
||||
* Helper function used to manage commit timeouts
|
||||
|
@ -93,16 +93,6 @@ static void commit_timeout(unsigned long __data)
|
|||
wake_up_process(p);
|
||||
}
|
||||
|
||||
/* Static check for data structure consistency. There's no code
|
||||
* invoked --- we'll just get a linker failure if things aren't right.
|
||||
*/
|
||||
void __journal_internal_check(void)
|
||||
{
|
||||
extern void journal_bad_superblock_size(void);
|
||||
if (sizeof(struct journal_superblock_s) != 1024)
|
||||
journal_bad_superblock_size();
|
||||
}
|
||||
|
||||
/*
|
||||
* kjournald: The main thread function used to manage a logging device
|
||||
* journal.
|
||||
|
@ -119,16 +109,12 @@ void __journal_internal_check(void)
|
|||
* known as checkpointing, and this thread is responsible for that job.
|
||||
*/
|
||||
|
||||
journal_t *current_journal; // AKPM: debug
|
||||
|
||||
int kjournald(void *arg)
|
||||
static int kjournald(void *arg)
|
||||
{
|
||||
journal_t *journal = (journal_t *) arg;
|
||||
transaction_t *transaction;
|
||||
struct timer_list timer;
|
||||
|
||||
current_journal = journal;
|
||||
|
||||
daemonize("kjournald");
|
||||
|
||||
/* Set up an interval timer which can be used to trigger a
|
||||
|
@ -1439,7 +1425,7 @@ int journal_wipe(journal_t *journal, int write)
|
|||
* device this journal is present.
|
||||
*/
|
||||
|
||||
const char *journal_dev_name(journal_t *journal, char *buffer)
|
||||
static const char *journal_dev_name(journal_t *journal, char *buffer)
|
||||
{
|
||||
struct block_device *bdev;
|
||||
|
||||
|
@ -1485,7 +1471,7 @@ void __journal_abort_hard(journal_t *journal)
|
|||
|
||||
/* Soft abort: record the abort error status in the journal superblock,
|
||||
* but don't do any other IO. */
|
||||
void __journal_abort_soft (journal_t *journal, int errno)
|
||||
static void __journal_abort_soft (journal_t *journal, int errno)
|
||||
{
|
||||
if (journal->j_flags & JFS_ABORT)
|
||||
return;
|
||||
|
@ -1880,7 +1866,7 @@ EXPORT_SYMBOL(journal_enable_debug);
|
|||
|
||||
static struct proc_dir_entry *proc_jbd_debug;
|
||||
|
||||
int read_jbd_debug(char *page, char **start, off_t off,
|
||||
static int read_jbd_debug(char *page, char **start, off_t off,
|
||||
int count, int *eof, void *data)
|
||||
{
|
||||
int ret;
|
||||
|
@ -1890,7 +1876,7 @@ int read_jbd_debug(char *page, char **start, off_t off,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int write_jbd_debug(struct file *file, const char __user *buffer,
|
||||
static int write_jbd_debug(struct file *file, const char __user *buffer,
|
||||
unsigned long count, void *data)
|
||||
{
|
||||
char buf[32];
|
||||
|
@ -1979,6 +1965,14 @@ static int __init journal_init(void)
|
|||
{
|
||||
int ret;
|
||||
|
||||
/* Static check for data structure consistency. There's no code
|
||||
* invoked --- we'll just get a linker failure if things aren't right.
|
||||
*/
|
||||
extern void journal_bad_superblock_size(void);
|
||||
if (sizeof(struct journal_superblock_s) != 1024)
|
||||
journal_bad_superblock_size();
|
||||
|
||||
|
||||
ret = journal_init_caches();
|
||||
if (ret != 0)
|
||||
journal_destroy_caches();
|
||||
|
|
|
@ -116,7 +116,8 @@ static inline int hash(journal_t *journal, unsigned long block)
|
|||
(block << (hash_shift - 12))) & (table->hash_size - 1);
|
||||
}
|
||||
|
||||
int insert_revoke_hash(journal_t *journal, unsigned long blocknr, tid_t seq)
|
||||
static int insert_revoke_hash(journal_t *journal, unsigned long blocknr,
|
||||
tid_t seq)
|
||||
{
|
||||
struct list_head *hash_list;
|
||||
struct jbd_revoke_record_s *record;
|
||||
|
|
|
@ -914,7 +914,6 @@ 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_soft (journal_t *, int);
|
||||
extern void journal_abort (journal_t *, int);
|
||||
extern int journal_errno (journal_t *);
|
||||
extern void journal_ack_err (journal_t *);
|
||||
|
|
Loading…
Reference in a new issue