hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Al Viro 2014-02-02 22:10:25 -05:00
parent c186afb4db
commit 9e8c2af96e
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/file.c
View File

@ -425,13 +425,8 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages,
struct page *page = prepared_pages[pg]; struct page *page = prepared_pages[pg];
/* /*
* Copy data from userspace to the current page * 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); copied = iov_iter_copy_from_user_atomic(page, i, offset, count);
pagefault_enable();
/* Flush processor's dcache for this page */ /* Flush processor's dcache for this page */
flush_dcache_page(page); flush_dcache_page(page);

2
fs/fuse/file.c
View File

@ -1003,9 +1003,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
if (mapping_writably_mapped(mapping)) if (mapping_writably_mapped(mapping))
flush_dcache_page(page); flush_dcache_page(page);
pagefault_disable();
tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes);
pagefault_enable();
flush_dcache_page(page); flush_dcache_page(page);
mark_page_accessed(page); mark_page_accessed(page);

3
mm/filemap.c
View File

@ -1974,7 +1974,6 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
char *kaddr; char *kaddr;
size_t copied; size_t copied;
BUG_ON(!in_atomic());
kaddr = kmap_atomic(page); kaddr = kmap_atomic(page);
if (likely(i->nr_segs == 1)) { if (likely(i->nr_segs == 1)) {
int left; int left;
@ -2348,9 +2347,7 @@ again:
if (mapping_writably_mapped(mapping)) if (mapping_writably_mapped(mapping))
flush_dcache_page(page); flush_dcache_page(page);
pagefault_disable();
copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);
pagefault_enable();
flush_dcache_page(page); flush_dcache_page(page);
mark_page_accessed(page); mark_page_accessed(page);