git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
fs
/
jffs2
/
background.c
diff --git
a/fs/jffs2/background.c
b/fs/jffs2/background.c
index
504643f
..
8adebd3
100644
(file)
--- 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);
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);
}
spin_unlock(&c->erase_completion_lock);
}
@@
-105,7
+105,7
@@
static int jffs2_garbage_collect_thread(void *_c)
/* 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)) {
+ while (signal_pending(current)
|| freezing(current)
) {
siginfo_t info;
unsigned long signr;
siginfo_t info;
unsigned long signr;