diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 14:50:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 14:50:42 -0800 |
| commit | 7a92cc6bcbc90bf72e57eff2dc29900a636c2d0d (patch) | |
| tree | 1c0524a39a06e72fc13489441f44a65e7c2dfefb /fs/iomap.c | |
| parent | 3f67790d2b7e322bcf363ec717085dd78c3ea7cd (diff) | |
| parent | 5abf186a30a89d5b9c18a6bf93a2c192c9fd52f6 (diff) | |
| download | linux-7a92cc6bcbc90bf72e57eff2dc29900a636c2d0d.tar.bz2 | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"8 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, fs: check for fatal signals in do_generic_file_read()
fs: break out of iomap_file_buffered_write on fatal signals
base/memory, hotplug: fix a kernel oops in show_valid_zones()
mm/memory_hotplug.c: check start_pfn in test_pages_in_a_zone()
jump label: pass kbuild_cflags when checking for asm goto support
shmem: fix sleeping from atomic context
kasan: respect /proc/sys/kernel/traceoff_on_warning
zswap: disable changing params if init fails
Diffstat (limited to 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 354a123f170e..a51cb4c07d4d 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -114,6 +114,9 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, BUG_ON(pos + len > iomap->offset + iomap->length); + if (fatal_signal_pending(current)) + return -EINTR; + page = grab_cache_page_write_begin(inode->i_mapping, index, flags); if (!page) return -ENOMEM; |