diff options
author | Andrew Morton <akpm@osdl.org> | 2006-03-25 06:06:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:22:50 -0500 |
commit | 8d8c85117fbcbaea7718870ad4b1ddd12940d9b0 (patch) | |
tree | 3e4c56b29a11ccad95a24679ecf41d341ffb844f | |
parent | e3df18983ea090a2e00dd5c2c6167bb431a0e0a2 (diff) |
[PATCH] jbd: convert kjournald to kthread API
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/jbd/journal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 6bd4647dc5a1..7f96b5cb6781 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -33,9 +33,11 @@ | |||
33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
34 | #include <linux/suspend.h> | 34 | #include <linux/suspend.h> |
35 | #include <linux/pagemap.h> | 35 | #include <linux/pagemap.h> |
36 | #include <linux/kthread.h> | ||
37 | #include <linux/proc_fs.h> | ||
38 | |||
36 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
37 | #include <asm/page.h> | 40 | #include <asm/page.h> |
38 | #include <linux/proc_fs.h> | ||
39 | 41 | ||
40 | EXPORT_SYMBOL(journal_start); | 42 | EXPORT_SYMBOL(journal_start); |
41 | EXPORT_SYMBOL(journal_restart); | 43 | EXPORT_SYMBOL(journal_restart); |
@@ -114,8 +116,6 @@ static int kjournald(void *arg) | |||
114 | journal_t *journal = arg; | 116 | journal_t *journal = arg; |
115 | transaction_t *transaction; | 117 | transaction_t *transaction; |
116 | 118 | ||
117 | daemonize("kjournald"); | ||
118 | |||
119 | /* | 119 | /* |
120 | * Set up an interval timer which can be used to trigger a commit wakeup | 120 | * Set up an interval timer which can be used to trigger a commit wakeup |
121 | * after the commit interval expires | 121 | * after the commit interval expires |
@@ -211,7 +211,7 @@ end_loop: | |||
211 | 211 | ||
212 | static void journal_start_thread(journal_t *journal) | 212 | static void journal_start_thread(journal_t *journal) |
213 | { | 213 | { |
214 | kernel_thread(kjournald, journal, CLONE_VM|CLONE_FS|CLONE_FILES); | 214 | kthread_run(kjournald, journal, "kjournald"); |
215 | wait_event(journal->j_wait_done_commit, journal->j_task != 0); | 215 | wait_event(journal->j_wait_done_commit, journal->j_task != 0); |
216 | } | 216 | } |
217 | 217 | ||