diff options
Diffstat (limited to 'fs/jffs2/background.c')
-rw-r--r-- | fs/jffs2/background.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c index e9580104b6ba..3ff50da94789 100644 --- a/fs/jffs2/background.c +++ b/fs/jffs2/background.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/completion.h> | 15 | #include <linux/completion.h> |
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/freezer.h> | 17 | #include <linux/freezer.h> |
18 | #include <linux/kthread.h> | ||
18 | #include "nodelist.h" | 19 | #include "nodelist.h" |
19 | 20 | ||
20 | 21 | ||
@@ -31,7 +32,7 @@ void jffs2_garbage_collect_trigger(struct jffs2_sb_info *c) | |||
31 | /* This must only ever be called when no GC thread is currently running */ | 32 | /* This must only ever be called when no GC thread is currently running */ |
32 | int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c) | 33 | int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c) |
33 | { | 34 | { |
34 | pid_t pid; | 35 | struct task_struct *tsk; |
35 | int ret = 0; | 36 | int ret = 0; |
36 | 37 | ||
37 | BUG_ON(c->gc_task); | 38 | BUG_ON(c->gc_task); |
@@ -39,15 +40,16 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c) | |||
39 | init_completion(&c->gc_thread_start); | 40 | init_completion(&c->gc_thread_start); |
40 | init_completion(&c->gc_thread_exit); | 41 | init_completion(&c->gc_thread_exit); |
41 | 42 | ||
42 | pid = kernel_thread(jffs2_garbage_collect_thread, c, CLONE_FS|CLONE_FILES); | 43 | tsk = kthread_run(jffs2_garbage_collect_thread, c, "jffs2_gcd_mtd%d", c->mtd->index); |
43 | if (pid < 0) { | 44 | if (IS_ERR(tsk)) { |
44 | printk(KERN_WARNING "fork failed for JFFS2 garbage collect thread: %d\n", -pid); | 45 | printk(KERN_WARNING "fork failed for JFFS2 garbage collect thread: %ld\n", -PTR_ERR(tsk)); |
45 | complete(&c->gc_thread_exit); | 46 | complete(&c->gc_thread_exit); |
46 | ret = pid; | 47 | ret = PTR_ERR(tsk); |
47 | } else { | 48 | } else { |
48 | /* Wait for it... */ | 49 | /* Wait for it... */ |
49 | D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", pid)); | 50 | D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", tsk->pid)); |
50 | wait_for_completion(&c->gc_thread_start); | 51 | wait_for_completion(&c->gc_thread_start); |
52 | ret = tsk->pid; | ||
51 | } | 53 | } |
52 | 54 | ||
53 | return ret; | 55 | return ret; |
@@ -71,7 +73,6 @@ static int jffs2_garbage_collect_thread(void *_c) | |||
71 | { | 73 | { |
72 | struct jffs2_sb_info *c = _c; | 74 | struct jffs2_sb_info *c = _c; |
73 | 75 | ||
74 | daemonize("jffs2_gcd_mtd%d", c->mtd->index); | ||
75 | allow_signal(SIGKILL); | 76 | allow_signal(SIGKILL); |
76 | allow_signal(SIGSTOP); | 77 | allow_signal(SIGSTOP); |
77 | allow_signal(SIGCONT); | 78 | allow_signal(SIGCONT); |
@@ -107,6 +108,11 @@ static int jffs2_garbage_collect_thread(void *_c) | |||
107 | * the GC thread get there first. */ | 108 | * the GC thread get there first. */ |
108 | schedule_timeout_interruptible(msecs_to_jiffies(50)); | 109 | schedule_timeout_interruptible(msecs_to_jiffies(50)); |
109 | 110 | ||
111 | if (kthread_should_stop()) { | ||
112 | D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): kthread_stop() called.\n")); | ||
113 | goto die; | ||
114 | } | ||
115 | |||
110 | /* Put_super will send a SIGKILL and then wait on the sem. | 116 | /* Put_super will send a SIGKILL and then wait on the sem. |
111 | */ | 117 | */ |
112 | while (signal_pending(current) || freezing(current)) { | 118 | while (signal_pending(current) || freezing(current)) { |