diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index d568ae846741a7a89729794404958d969c98507e..8adebd3e43c690fbf0469cf9b235279998c252c8 100644
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -105,7 +105,7 @@ static int jffs2_garbage_collect_thread(void *_c)
 
 		/* 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;