projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index 58e04e26f9965d5ddb8c35fc3770349493b62eab..1bb007624b53e1cc086ae26d91238d6c3683d6b2 100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-1722,7
+1722,7
@@
no_cached_page:
goto out;
}
error = add_to_page_cache_lru(page, mapping, index,
goto out;
}
error = add_to_page_cache_lru(page, mapping, index,
-
GFP_KERNEL & mapping_gfp_mask(mapping
));
+
mapping_gfp_constraint(mapping, GFP_KERNEL
));
if (error) {
page_cache_release(page);
if (error == -EEXIST) {
if (error) {
page_cache_release(page);
if (error == -EEXIST) {
@@
-1824,7
+1824,7
@@
static int page_cache_read(struct file *file, pgoff_t offset)
return -ENOMEM;
ret = add_to_page_cache_lru(page, mapping, offset,
return -ENOMEM;
ret = add_to_page_cache_lru(page, mapping, offset,
-
GFP_KERNEL & mapping_gfp_mask(mapping
));
+
mapping_gfp_constraint(mapping, GFP_KERNEL
));
if (ret == 0)
ret = mapping->a_ops->readpage(file, page);
else if (ret == -EEXIST)
if (ret == 0)
ret = mapping->a_ops->readpage(file, page);
else if (ret == -EEXIST)
@@
-2713,7
+2713,7
@@
EXPORT_SYMBOL(generic_file_write_iter);
* page is known to the local caching routines.
*
* The @gfp_mask argument specifies whether I/O may be performed to release
* page is known to the local caching routines.
*
* The @gfp_mask argument specifies whether I/O may be performed to release
- * this page (__GFP_IO), and whether the call may block (__GFP_
WAIT
& __GFP_FS).
+ * this page (__GFP_IO), and whether the call may block (__GFP_
RECLAIM
& __GFP_FS).
*
*/
int try_to_release_page(struct page *page, gfp_t gfp_mask)
*
*/
int try_to_release_page(struct page *page, gfp_t gfp_mask)