[JFFS2] Fix suspend failure with JFFS2 GC thread.
The try_to_freeze() call was in the wrong place; we need it in the signal-pending loop now that a pending freeze also makes signal_pending() return true. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
parent
66bfaeaa90
commit
e716dd3644
|
@ -83,7 +83,7 @@ static int jffs2_garbage_collect_thread(void *_c)
|
|||
|
||||
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"));
|
||||
|
@ -94,9 +94,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
|
||||
|
@ -111,6 +108,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, ¤t->blocked, &info);
|
||||
|
||||
switch(signr) {
|
||||
|
|
Loading…
Reference in a new issue