Merge part 2 of branch 'sysfs-devel'

[linux-block.git] / fs / coredump.c

diff --git a/fs/coredump.c b/fs/coredump.c
index 2868e3e171ae615f9c065ec242e150c6eb5e30aa..c3d8fc14b993047bfb9a628e893537eb926e0e85 100644 (file)
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -519,7 +519,7 @@ static bool dump_interrupted(void)
         * but then we need to teach dump_write() to restart and clear
         * TIF_SIGPENDING.
         */
-       return signal_pending(current);
+       return fatal_signal_pending(current) || freezing(current);
 }
 
 static void wait_for_dump_helpers(struct file *file)