jffs2: move jffs2_gcd_mtd threads to the new kthread API

Move the jffs2 garbage collecting thread to the new kthread API.

Signed-off-by: Gerard Lledo <gerard.lledo@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index e9580104b6ba477894b60c6bb3e69839c5677d2f..3ff50da94789111a4707082eefb4289c377e1a51 100644 (file)
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -15,6 +15,7 @@
 #include <linux/completion.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
+#include <linux/kthread.h>
 #include "nodelist.h"
 
 
@@ -31,7 +32,7 @@ void jffs2_garbage_collect_trigger(struct jffs2_sb_info *c)
 /* This must only ever be called when no GC thread is currently running */
 int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
 {
-       pid_t pid;
+       struct task_struct *tsk;
        int ret = 0;
 
        BUG_ON(c->gc_task);
@@ -39,15 +40,16 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
        init_completion(&c->gc_thread_start);
        init_completion(&c->gc_thread_exit);
 
-       pid = kernel_thread(jffs2_garbage_collect_thread, c, CLONE_FS|CLONE_FILES);
-       if (pid < 0) {
-               printk(KERN_WARNING "fork failed for JFFS2 garbage collect thread: %d\n", -pid);
+       tsk = kthread_run(jffs2_garbage_collect_thread, c, "jffs2_gcd_mtd%d", c->mtd->index);
+       if (IS_ERR(tsk)) {
+               printk(KERN_WARNING "fork failed for JFFS2 garbage collect thread: %ld\n", -PTR_ERR(tsk));
                complete(&c->gc_thread_exit);
-               ret = pid;
+               ret = PTR_ERR(tsk);
        } else {
                /* Wait for it... */
-               D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", pid));
+               D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", tsk->pid));
                wait_for_completion(&c->gc_thread_start);
+               ret = tsk->pid;
        }
 
        return ret;
@@ -71,7 +73,6 @@ static int jffs2_garbage_collect_thread(void *_c)
 {
        struct jffs2_sb_info *c = _c;
 
-       daemonize("jffs2_gcd_mtd%d", c->mtd->index);
        allow_signal(SIGKILL);
        allow_signal(SIGSTOP);
        allow_signal(SIGCONT);
@@ -107,6 +108,11 @@ static int jffs2_garbage_collect_thread(void *_c)
                 * the GC thread get there first. */
                schedule_timeout_interruptible(msecs_to_jiffies(50));
 
+               if (kthread_should_stop()) {
+                       D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread():  kthread_stop() called.\n"));
+                       goto die;
+               }
+
                /* Put_super will send a SIGKILL and then wait on the sem.
                 */
                while (signal_pending(current) || freezing(current)) {