3 files changed, 14 insertions, 13 deletions

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 95a628d8cac8..6bd4647dc5a1 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -111,18 +111,17 @@ static void commit_timeout(unsigned long __data)
 
 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 --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 5fc40888f4cf..ada31fa272e3 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -53,8 +53,8 @@ get_transaction(journal_t *journal, transaction_t *transaction)
         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 --git a/include/linux/jbd.h b/include/linux/jbd.h
index 2ccbfb6340ba..4fc7dffd66ef 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -29,6 +29,8 @@
 #include <linux/stddef.h>
 #include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
+#include <linux/timer.h>
+
 #include <asm/semaphore.h>
 #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