diff options
Diffstat (limited to 'fs/cachefiles/rdwr.c')
-rw-r--r-- | fs/cachefiles/rdwr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c index 18d7aa61ef0f..883bc7bb12c5 100644 --- a/fs/cachefiles/rdwr.c +++ b/fs/cachefiles/rdwr.c | |||
@@ -256,8 +256,7 @@ static int cachefiles_read_backing_file_one(struct cachefiles_object *object, | |||
256 | goto backing_page_already_present; | 256 | goto backing_page_already_present; |
257 | 257 | ||
258 | if (!newpage) { | 258 | if (!newpage) { |
259 | newpage = __page_cache_alloc(cachefiles_gfp | | 259 | newpage = __page_cache_alloc(cachefiles_gfp); |
260 | __GFP_COLD); | ||
261 | if (!newpage) | 260 | if (!newpage) |
262 | goto nomem_monitor; | 261 | goto nomem_monitor; |
263 | } | 262 | } |
@@ -493,8 +492,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, | |||
493 | goto backing_page_already_present; | 492 | goto backing_page_already_present; |
494 | 493 | ||
495 | if (!newpage) { | 494 | if (!newpage) { |
496 | newpage = __page_cache_alloc(cachefiles_gfp | | 495 | newpage = __page_cache_alloc(cachefiles_gfp); |
497 | __GFP_COLD); | ||
498 | if (!newpage) | 496 | if (!newpage) |
499 | goto nomem; | 497 | goto nomem; |
500 | } | 498 | } |
@@ -710,7 +708,7 @@ int cachefiles_read_or_alloc_pages(struct fscache_retrieval *op, | |||
710 | /* calculate the shift required to use bmap */ | 708 | /* calculate the shift required to use bmap */ |
711 | shift = PAGE_SHIFT - inode->i_sb->s_blocksize_bits; | 709 | shift = PAGE_SHIFT - inode->i_sb->s_blocksize_bits; |
712 | 710 | ||
713 | pagevec_init(&pagevec, 0); | 711 | pagevec_init(&pagevec); |
714 | 712 | ||
715 | op->op.flags &= FSCACHE_OP_KEEP_FLAGS; | 713 | op->op.flags &= FSCACHE_OP_KEEP_FLAGS; |
716 | op->op.flags |= FSCACHE_OP_ASYNC; | 714 | op->op.flags |= FSCACHE_OP_ASYNC; |
@@ -844,7 +842,7 @@ int cachefiles_allocate_pages(struct fscache_retrieval *op, | |||
844 | 842 | ||
845 | ret = cachefiles_has_space(cache, 0, *nr_pages); | 843 | ret = cachefiles_has_space(cache, 0, *nr_pages); |
846 | if (ret == 0) { | 844 | if (ret == 0) { |
847 | pagevec_init(&pagevec, 0); | 845 | pagevec_init(&pagevec); |
848 | 846 | ||
849 | list_for_each_entry(page, pages, lru) { | 847 | list_for_each_entry(page, pages, lru) { |
850 | if (pagevec_add(&pagevec, page) == 0) | 848 | if (pagevec_add(&pagevec, page) == 0) |