summaryrefslogtreecommitdiff
path: root/fs/jffs
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-28 18:03:36 +0400
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-28 18:03:36 +0400
commitda28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch)
treeb3ff509f21352ef053cb3d490cb13528090d32ac /fs/jffs
parent6de7dc2c4c713d037c19aa1e310d240f16973414 (diff)
parent577a4f8102d54b504cb22eb021b89e957e8df18f (diff)
downloadlinux-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.xz
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/jffs')
-rw-r--r--fs/jffs/intrep.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index fc589ddd0762..456d7e6e29c2 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -3397,6 +3397,9 @@ jffs_garbage_collect_thread(void *ptr)
siginfo_t info;
unsigned long signr = 0;
+ if (try_to_freeze())
+ continue;
+
spin_lock_irq(&current->sighand->siglock);
signr = dequeue_signal(current, &current->blocked, &info);
spin_unlock_irq(&current->sighand->siglock);