From 85c3b4dafad83775b71c089d65c3b058b95ad0fc Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 25 Mar 2006 03:06:53 -0800
Subject: [PATCH] --- yaml --- r: 23519 b: refs/heads/master c:
 8d8c85117fbcbaea7718870ad4b1ddd12940d9b0 h: refs/heads/master i:   23517:
 9ab93530884e885c6295df07635f33467c4dd228   23515:
 8ed639c0210070569648dde8a86f8d884139bde4   23511:
 7cba90ef3830428929e6e2b94f2daad23a95ed71   23503:
 0b12600efa9af279e11a59e9324315aacc89455a   23487:
 7cdac0278f734fff17ed9026e63765c5ba116815 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/jbd/journal.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b0de0fe5f6f9..32d82b453a54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3df18983ea090a2e00dd5c2c6167bb431a0e0a2
+refs/heads/master: 8d8c85117fbcbaea7718870ad4b1ddd12940d9b0
diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c
index 6bd4647dc5a1..7f96b5cb6781 100644
--- a/trunk/fs/jbd/journal.c
+++ b/trunk/fs/jbd/journal.c
@@ -33,9 +33,11 @@
 #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);
@@ -114,8 +116,6 @@ static int kjournald(void *arg)
 	journal_t *journal = arg;
 	transaction_t *transaction;
 
-	daemonize("kjournald");
-
 	/*
 	 * Set up an interval timer which can be used to trigger a commit wakeup
 	 * after the commit interval expires
@@ -211,7 +211,7 @@ static int kjournald(void *arg)
 
 static void journal_start_thread(journal_t *journal)
 {
-	kernel_thread(kjournald, journal, CLONE_VM|CLONE_FS|CLONE_FILES);
+	kthread_run(kjournald, journal, "kjournald");
 	wait_event(journal->j_wait_done_commit, journal->j_task != 0);
 }