Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git] / fs / ioctl.c
index 214c3c11fbc24c76cc85d2f20f4d2aa88201aba0..5d01d2638ca5482cc4edb2144be7ba3fc5f16aa4 100644 (file)
@@ -379,6 +379,11 @@ int __generic_block_fiemap(struct inode *inode,
                                past_eof = true;
                }
                cond_resched();
+               if (fatal_signal_pending(current)) {
+                       ret = -EINTR;
+                       break;
+               }
+
        } while (1);
 
        /* If ret is 1 then we just hit the end of the extent array */