diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-02 22:10:25 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-01 23:19:20 -0400 |
commit | 9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d (patch) | |
tree | bd078fdfaf34ce0cb9ab258d39f0669b5610f5c8 /fs | |
parent | c186afb4dbd0050a537b96c7fbee2dba3b57fc38 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/file.c | 5 | ||||
-rw-r--r-- | fs/fuse/file.c | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 0165b8672f09..34e096201da1 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -425,13 +425,8 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages, | |||
425 | struct page *page = prepared_pages[pg]; | 425 | struct page *page = prepared_pages[pg]; |
426 | /* | 426 | /* |
427 | * Copy data from userspace to the current page | 427 | * Copy data from userspace to the current page |
428 | * | ||
429 | * Disable pagefault to avoid recursive lock since | ||
430 | * the pages are already locked | ||
431 | */ | 428 | */ |
432 | pagefault_disable(); | ||
433 | copied = iov_iter_copy_from_user_atomic(page, i, offset, count); | 429 | copied = iov_iter_copy_from_user_atomic(page, i, offset, count); |
434 | pagefault_enable(); | ||
435 | 430 | ||
436 | /* Flush processor's dcache for this page */ | 431 | /* Flush processor's dcache for this page */ |
437 | flush_dcache_page(page); | 432 | flush_dcache_page(page); |
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 77bcc303c3ae..a91d3b4d32f3 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -1003,9 +1003,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, | |||
1003 | if (mapping_writably_mapped(mapping)) | 1003 | if (mapping_writably_mapped(mapping)) |
1004 | flush_dcache_page(page); | 1004 | flush_dcache_page(page); |
1005 | 1005 | ||
1006 | pagefault_disable(); | ||
1007 | tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); | 1006 | tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); |
1008 | pagefault_enable(); | ||
1009 | flush_dcache_page(page); | 1007 | flush_dcache_page(page); |
1010 | 1008 | ||
1011 | mark_page_accessed(page); | 1009 | mark_page_accessed(page); |