From: Andrew Morton The kjournald timer is currently on the kernel thread's stack and the journal structure points at it. Save a pointer hop by moving the timer into the journal structure. Signed-off-by: Andrew Morton --- fs/jbd/journal.c | 19 +++++++++---------- fs/jbd/transaction.c | 4 ++-- include/linux/jbd.h | 4 +++- 3 files changed, 14 insertions(+), 13 deletions(-) diff -puN fs/jbd/journal.c~jbd-embed-j_commit_timer-in-journal-struct fs/jbd/journal.c --- devel/fs/jbd/journal.c~jbd-embed-j_commit_timer-in-journal-struct 2006-02-18 17:06:02.000000000 -0800 +++ devel-akpm/fs/jbd/journal.c 2006-02-18 17:06:02.000000000 -0800 @@ -111,18 +111,17 @@ static void commit_timeout(unsigned long static int kjournald(void *arg) { - journal_t *journal = (journal_t *) arg; + journal_t *journal = arg; transaction_t *transaction; - struct timer_list timer; daemonize("kjournald"); - /* Set up an interval timer which can be used to trigger a - commit wakeup after the commit interval expires */ - init_timer(&timer); - timer.data = (unsigned long) current; - timer.function = commit_timeout; - journal->j_commit_timer = &timer; + /* + * Set up an interval timer which can be used to trigger a commit wakeup + * after the commit interval expires + */ + setup_timer(&journal->j_commit_timer, commit_timeout, + (unsigned long)current); /* Record that the journal thread is running */ journal->j_task = current; @@ -146,7 +145,7 @@ loop: if (journal->j_commit_sequence != journal->j_commit_request) { jbd_debug(1, "OK, requests differ\n"); spin_unlock(&journal->j_state_lock); - del_timer_sync(journal->j_commit_timer); + del_timer_sync(&journal->j_commit_timer); journal_commit_transaction(journal); spin_lock(&journal->j_state_lock); goto loop; @@ -203,7 +202,7 @@ loop: end_loop: spin_unlock(&journal->j_state_lock); - del_timer_sync(journal->j_commit_timer); + del_timer_sync(&journal->j_commit_timer); journal->j_task = NULL; wake_up(&journal->j_wait_done_commit); jbd_debug(1, "Journal thread exiting.\n"); diff -puN fs/jbd/transaction.c~jbd-embed-j_commit_timer-in-journal-struct fs/jbd/transaction.c --- devel/fs/jbd/transaction.c~jbd-embed-j_commit_timer-in-journal-struct 2006-02-18 17:06:02.000000000 -0800 +++ devel-akpm/fs/jbd/transaction.c 2006-02-18 17:06:02.000000000 -0800 @@ -53,8 +53,8 @@ get_transaction(journal_t *journal, tran spin_lock_init(&transaction->t_handle_lock); /* Set up the commit timer for the new transaction. */ - journal->j_commit_timer->expires = transaction->t_expires; - add_timer(journal->j_commit_timer); + journal->j_commit_timer.expires = transaction->t_expires; + add_timer(&journal->j_commit_timer); J_ASSERT(journal->j_running_transaction == NULL); journal->j_running_transaction = transaction; diff -puN include/linux/jbd.h~jbd-embed-j_commit_timer-in-journal-struct include/linux/jbd.h --- devel/include/linux/jbd.h~jbd-embed-j_commit_timer-in-journal-struct 2006-02-18 17:06:06.000000000 -0800 +++ devel-akpm/include/linux/jbd.h 2006-02-18 17:06:33.000000000 -0800 @@ -29,6 +29,8 @@ #include #include #include +#include + #include #endif @@ -787,7 +789,7 @@ struct journal_s unsigned long j_commit_interval; /* The timer used to wakeup the commit thread: */ - struct timer_list *j_commit_timer; + struct timer_list j_commit_timer; /* * The revoke table: maintains the list of revoked blocks in the _