[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
71c2339775
commit
7b687707d7
|
@ -84,7 +84,7 @@ static int jffs2_garbage_collect_thread(void *_c)
|
||||||
set_freezable();
|
set_freezable();
|
||||||
for (;;) {
|
for (;;) {
|
||||||
allow_signal(SIGHUP);
|
allow_signal(SIGHUP);
|
||||||
|
again:
|
||||||
if (!jffs2_thread_should_wake(c)) {
|
if (!jffs2_thread_should_wake(c)) {
|
||||||
set_current_state (TASK_INTERRUPTIBLE);
|
set_current_state (TASK_INTERRUPTIBLE);
|
||||||
D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread sleeping...\n"));
|
D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread sleeping...\n"));
|
||||||
|
@ -95,9 +95,6 @@ static int jffs2_garbage_collect_thread(void *_c)
|
||||||
schedule();
|
schedule();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (try_to_freeze())
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* This thread is purely an optimisation. But if it runs when
|
/* This thread is purely an optimisation. But if it runs when
|
||||||
other things could be running, it actually makes things a
|
other things could be running, it actually makes things a
|
||||||
lot worse. Use yield() and put it at the back of the runqueue
|
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;
|
siginfo_t info;
|
||||||
unsigned long signr;
|
unsigned long signr;
|
||||||
|
|
||||||
|
if (try_to_freeze())
|
||||||
|
goto again;
|
||||||
|
|
||||||
signr = dequeue_signal_lock(current, ¤t->blocked, &info);
|
signr = dequeue_signal_lock(current, ¤t->blocked, &info);
|
||||||
|
|
||||||
switch(signr) {
|
switch(signr) {
|
||||||
|
|
Loading…
Reference in New Issue