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>

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 72da4df53c9a224d7a5106a907fc4ba4e08f5ebb..9952a2a68fdad31fb63e8d0d0f44e5eb16a02231 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -426,13 +426,8 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages,
                struct page *page = prepared_pages[pg];
                /*
                 * Copy data from userspace to the current page
-                *
-                * Disable pagefault to avoid recursive lock since
-                * the pages are already locked
                 */
-               pagefault_disable();
                copied = iov_iter_copy_from_user_atomic(page, i, offset, count);
-               pagefault_enable();
 
                /* Flush processor's dcache for this page */
                flush_dcache_page(page);

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 4598345ab87d683dba75022a4a07981dbfb458ed..bf9a755aeb6241fd3d0489fa03789a473b5ed0f5 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -985,9 +985,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
                if (mapping_writably_mapped(mapping))
                        flush_dcache_page(page);
 
-               pagefault_disable();
                tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes);
-               pagefault_enable();
                flush_dcache_page(page);
 
                mark_page_accessed(page);

diff --git a/mm/filemap.c b/mm/filemap.c
index d0f765f599f6bf5e5d8b1f99a7bd368322e56cad..8144c27d2bc87e39061ce8ee106650b9419fa660 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2190,7 +2190,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;
@@ -2564,9 +2563,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);