diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 1cd0b87861bb..f3033d0f5e51 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2033,7 +2033,7 @@ int pagecache_write_begin(struct file *file, struct address_space *mapping, struct inode *inode = mapping->host; struct page *page; again: - page = __grab_cache_page(mapping, index); + page = grab_cache_page_write_begin(mapping, index, flags); *pagep = page; if (!page) return -ENOMEM; @@ -2197,19 +2197,24 @@ EXPORT_SYMBOL(generic_file_direct_write); * Find or create a page at the given pagecache position. Return the locked * page. This function is specifically for buffered writes. */ -struct page *__grab_cache_page(struct address_space *mapping, pgoff_t index) +struct page *grab_cache_page_write_begin(struct address_space *mapping, + pgoff_t index, unsigned flags) { int status; struct page *page; + gfp_t gfp_notmask = 0; + if (flags & AOP_FLAG_NOFS) + gfp_notmask = __GFP_FS; repeat: page = find_lock_page(mapping, index); if (likely(page)) return page; - page = page_cache_alloc(mapping); + page = __page_cache_alloc(mapping_gfp_mask(mapping) & ~gfp_notmask); if (!page) return NULL; - status = add_to_page_cache_lru(page, mapping, index, GFP_KERNEL); + status = add_to_page_cache_lru(page, mapping, index, + GFP_KERNEL & ~gfp_notmask); if (unlikely(status)) { page_cache_release(page); if (status == -EEXIST) @@ -2218,7 +2223,7 @@ repeat: } return page; } -EXPORT_SYMBOL(__grab_cache_page); +EXPORT_SYMBOL(grab_cache_page_write_begin); static ssize_t generic_perform_write_2copy(struct file *file, struct iov_iter *i, loff_t pos) @@ -2263,7 +2268,7 @@ static ssize_t generic_perform_write_2copy(struct file *file, break; } - page = __grab_cache_page(mapping, index); + page = grab_cache_page_write_begin(mapping, index, 0); if (!page) { status = -ENOMEM; break; |