1 files changed, 6 insertions, 6 deletions

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 143c5530caf3..d568ae846741 100644
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -23,8 +23,8 @@ static int jffs2_garbage_collect_thread(void *);
 void jffs2_garbage_collect_trigger(struct jffs2_sb_info *c)
 {
         spin_lock(&c->erase_completion_lock);
-        if (c->gc_task && jffs2_thread_should_wake(c))
-                send_sig(SIGHUP, c->gc_task, 1);
+        if (c->gc_task && jffs2_thread_should_wake(c))
+                send_sig(SIGHUP, c->gc_task, 1);
         spin_unlock(&c->erase_completion_lock);
 }
 
@@ -84,7 +84,7 @@ static int jffs2_garbage_collect_thread(void *_c)
         set_freezable();
         for (;;) {
                 allow_signal(SIGHUP);
-
+        again:
                 if (!jffs2_thread_should_wake(c)) {
                         set_current_state (TASK_INTERRUPTIBLE);
                         D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread sleeping...\n"));
@@ -95,9 +95,6 @@ static int jffs2_garbage_collect_thread(void *_c)
                         schedule();
                 }
 
-                if (try_to_freeze())
-                        continue;
-
                 /* This thread is purely an optimisation. But if it runs when
                    other things could be running, it actually makes things a
                    lot worse. Use yield() and put it at the back of the runqueue
@@ -112,6 +109,9 @@ static int jffs2_garbage_collect_thread(void *_c)
                         siginfo_t info;
                         unsigned long signr;
 
+                        if (try_to_freeze())
+                                goto again;
+
                         signr = dequeue_signal_lock(current, &current->blocked, &info);
 
                         switch(signr) {