Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 72ef5b50e048aae663fe9b8a3702646a773ea414

Authored by Al Viro
Committed by Jiri Slaby
1 parent 4fb08e5ab5
Exists in ti-linux-3.12.y and in 2 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.y

callers of iov_copy_from_user_atomic() don't need pagecache_disable() 

commit 9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d upstream.

... it does that itself (via kmap_atomic())

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

Showing 3 changed files with 0 additions and 10 deletions Side-by-side Diff

... ... @@ -426,13 +426,8 @@
426 426 struct page *page = prepared_pages[pg];
427 427 /*
428 428 * Copy data from userspace to the current page
429   - *
430   - * Disable pagefault to avoid recursive lock since
431   - * the pages are already locked
432 429 */
433   - pagefault_disable();
434 430 copied = iov_iter_copy_from_user_atomic(page, i, offset, count);
435   - pagefault_enable();
436 431  
437 432 /* Flush processor's dcache for this page */
438 433 flush_dcache_page(page);
... ... @@ -985,9 +985,7 @@
985 985 if (mapping_writably_mapped(mapping))
986 986 flush_dcache_page(page);
987 987  
988   - pagefault_disable();
989 988 tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes);
990   - pagefault_enable();
991 989 flush_dcache_page(page);
992 990  
993 991 mark_page_accessed(page);
... ... @@ -2190,7 +2190,6 @@
2190 2190 char *kaddr;
2191 2191 size_t copied;
2192 2192  
2193   - BUG_ON(!in_atomic());
2194 2193 kaddr = kmap_atomic(page);
2195 2194 if (likely(i->nr_segs == 1)) {
2196 2195 int left;
2197 2196  
... ... @@ -2564,9 +2563,7 @@
2564 2563 if (mapping_writably_mapped(mapping))
2565 2564 flush_dcache_page(page);
2566 2565  
2567   - pagefault_disable();
2568 2566 copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);
2569   - pagefault_enable();
2570 2567 flush_dcache_page(page);
2571 2568  
2572 2569 mark_page_accessed(page);