summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-02 22:10:25 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:20 -0400
commit9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d (patch)
treebd078fdfaf34ce0cb9ab258d39f0669b5610f5c8 /mm
parentc186afb4dbd0050a537b96c7fbee2dba3b57fc38 (diff)
downloadlinux-stable-9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d.tar.gz
linux-stable-9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d.tar.bz2
linux-stable-9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d.zip
callers of iov_copy_from_user_atomic() don't need pagecache_disable()
... it does that itself (via kmap_atomic()) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 46e98019af6c..bfb7a97d6d0f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1974,7 +1974,6 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
char *kaddr;
size_t copied;
- BUG_ON(!in_atomic());
kaddr = kmap_atomic(page);
if (likely(i->nr_segs == 1)) {
int left;
@@ -2348,9 +2347,7 @@ again:
if (mapping_writably_mapped(mapping))
flush_dcache_page(page);
- pagefault_disable();
copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);
- pagefault_enable();
flush_dcache_page(page);
mark_page_accessed(page);