diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-28 19:34:57 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-09-26 11:51:58 +0200 |
| commit | 72ef5b50e048aae663fe9b8a3702646a773ea414 (patch) | |
| tree | dd95550583d2c1ffc1e67bd644bad655ba1c211e | |
| parent | 4fb08e5ab578244164bd2269bd0d5d14669ed35a (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: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/btrfs/file.c | 5 | ||||
| -rw-r--r-- | fs/fuse/file.c | 2 | ||||
| -rw-r--r-- | mm/filemap.c | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 72da4df53c9a..9952a2a68fda 100644 --- 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 4598345ab87d..bf9a755aeb62 100644 --- 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 d0f765f599f6..8144c27d2bc8 100644 --- 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); |