linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / jbd / journal.c

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 7f96b5c..e4b516a 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -33,11 +33,9 @@
 #include <linux/mm.h>
 #include <linux/suspend.h>
 #include <linux/pagemap.h>
-#include <linux/kthread.h>
-#include <linux/proc_fs.h>
-
 #include <asm/uaccess.h>
 #include <asm/page.h>
+#include <linux/proc_fs.h>
 
 EXPORT_SYMBOL(journal_start);
 EXPORT_SYMBOL(journal_restart);
@@ -113,15 +111,18 @@ static void commit_timeout(unsigned long __data)
 
 static int kjournald(void *arg)
 {
-       journal_t *journal = arg;
+       journal_t *journal = (journal_t *) arg;
        transaction_t *transaction;
+       struct timer_list 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);
+       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;
 
        /* Record that the journal thread is running */
        journal->j_task = current;
@@ -145,7 +146,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;
@@ -202,7 +203,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");
@@ -211,7 +212,7 @@ end_loop:
 
 static void journal_start_thread(journal_t *journal)
 {
-       kthread_run(kjournald, journal, "kjournald");
+       kernel_thread(kjournald, journal, CLONE_VM|CLONE_FS|CLONE_FILES);
        wait_event(journal->j_wait_done_commit, journal->j_task != 0);
 }
 
@@ -658,8 +659,8 @@ static journal_t * journal_init_common (void)
        init_waitqueue_head(&journal->j_wait_checkpoint);
        init_waitqueue_head(&journal->j_wait_commit);
        init_waitqueue_head(&journal->j_wait_updates);
-       mutex_init(&journal->j_barrier);
-       mutex_init(&journal->j_checkpoint_mutex);
+       init_MUTEX(&journal->j_barrier);
+       init_MUTEX(&journal->j_checkpoint_sem);
        spin_lock_init(&journal->j_revoke_lock);
        spin_lock_init(&journal->j_list_lock);
        spin_lock_init(&journal->j_state_lock);