Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[linux-2.6] / fs / jffs2 / background.c

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 65119d72cce0285cba5f7d147a3b37799e4db8aa..7b77a9541125b7b62aa01d0cf3961f45cb1ca47c 100644 (file)
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -15,6 +15,7 @@
 #include <linux/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
+#include <linux/sched.h>
 #include "nodelist.h"
 
 
@@ -50,7 +51,7 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
                D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", pid));
                wait_for_completion(&c->gc_thread_start);
        }
- 
+
        return ret;
 }
 
@@ -95,12 +96,12 @@ static int jffs2_garbage_collect_thread(void *_c)
                        schedule();
                }
 
-               if (try_to_freeze(0))
+               if (try_to_freeze())
                        continue;
 
                cond_resched();
 
-               /* Put_super will send a SIGKILL and then wait on the sem. 
+               /* Put_super will send a SIGKILL and then wait on the sem.
                 */
                while (signal_pending(current)) {
                        siginfo_t info;