diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-02 22:10:25 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-01 23:19:20 -0400 |
commit | 9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d (patch) | |
tree | bd078fdfaf34ce0cb9ab258d39f0669b5610f5c8 /mm | |
parent | c186afb4dbd0050a537b96c7fbee2dba3b57fc38 (diff) |
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.c | 3 |
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, | |||
1974 | char *kaddr; | 1974 | char *kaddr; |
1975 | size_t copied; | 1975 | size_t copied; |
1976 | 1976 | ||
1977 | BUG_ON(!in_atomic()); | ||
1978 | kaddr = kmap_atomic(page); | 1977 | kaddr = kmap_atomic(page); |
1979 | if (likely(i->nr_segs == 1)) { | 1978 | if (likely(i->nr_segs == 1)) { |
1980 | int left; | 1979 | int left; |
@@ -2348,9 +2347,7 @@ again: | |||
2348 | if (mapping_writably_mapped(mapping)) | 2347 | if (mapping_writably_mapped(mapping)) |
2349 | flush_dcache_page(page); | 2348 | flush_dcache_page(page); |
2350 | 2349 | ||
2351 | pagefault_disable(); | ||
2352 | copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); | 2350 | copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); |
2353 | pagefault_enable(); | ||
2354 | flush_dcache_page(page); | 2351 | flush_dcache_page(page); |
2355 | 2352 | ||
2356 | mark_page_accessed(page); | 2353 | mark_page_accessed(page); |