diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-02 22:10:25 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-21 09:23:06 -0800 |
| commit | 9fb77c771373c078f93807f077c29ebafe720a25 (patch) | |
| tree | 77c8f6a254ab9da8ce5fdf5cf5e5d12cb15855a8 /mm/filemap.c | |
| parent | 034c4b3e832b22ec83e7bd409cf1ad3efba18f45 (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/filemap.c')
| -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 f287e2551f57..bdaa21555abe 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2188,7 +2188,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; @@ -2562,9 +2561,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); |