Merge with Linus' 2.6 tree

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);