projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux into randconfig-4.8
[deliverable/linux.git]
/
fs
/
mpage.c
diff --git
a/fs/mpage.c
b/fs/mpage.c
index 37b28280ad04065cebdebe73c309581fb256863b..2ca1f39c8cba1aefcbf330d845be6cdefd921e9e 100644
(file)
--- a/
fs/mpage.c
+++ b/
fs/mpage.c
@@
-72,6
+72,8
@@
mpage_alloc(struct block_device *bdev,
{
struct bio *bio;
{
struct bio *bio;
+ /* Restrict the given (page cache) mask for slab allocations */
+ gfp_flags &= GFP_KERNEL;
bio = bio_alloc(gfp_flags, nr_vecs);
if (bio == NULL && (current->flags & PF_MEMALLOC)) {
bio = bio_alloc(gfp_flags, nr_vecs);
if (bio == NULL && (current->flags & PF_MEMALLOC)) {
@@
-363,7
+365,7
@@
mpage_readpages(struct address_space *mapping, struct list_head *pages,
sector_t last_block_in_bio = 0;
struct buffer_head map_bh;
unsigned long first_logical_block = 0;
sector_t last_block_in_bio = 0;
struct buffer_head map_bh;
unsigned long first_logical_block = 0;
- gfp_t gfp =
mapping_gfp_constraint(mapping, GFP_KERNEL
);
+ gfp_t gfp =
readahead_gfp_mask(mapping
);
map_bh.b_state = 0;
map_bh.b_size = 0;
map_bh.b_state = 0;
map_bh.b_size = 0;
This page took
0.025756 seconds
and
5
git commands to generate.