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
timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper
[firefly-linux-kernel-4.4.55.git]
/
fs
/
mpage.c
diff --git
a/fs/mpage.c
b/fs/mpage.c
index 09abba7653aa8db8189d05d7c2094b77ef1998a9..1480d3a180370fe3922a7724e613d09b896f9d00 100644
(file)
--- a/
fs/mpage.c
+++ b/
fs/mpage.c
@@
-361,7
+361,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 =
GFP_KERNEL & mapping_gfp_mask(mapping
);
+ gfp_t gfp =
mapping_gfp_constraint(mapping, GFP_KERNEL
);
map_bh.b_state = 0;
map_bh.b_size = 0;
map_bh.b_state = 0;
map_bh.b_size = 0;
@@
-397,7
+397,7
@@
int mpage_readpage(struct page *page, get_block_t get_block)
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 =
GFP_KERNEL & mapping_gfp_mask(page->mapping
);
+ gfp_t gfp =
mapping_gfp_constraint(page->mapping, GFP_KERNEL
);
map_bh.b_state = 0;
map_bh.b_size = 0;
map_bh.b_state = 0;
map_bh.b_size = 0;