projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
fs
/
cifs
/
file.c
diff --git
a/fs/cifs/file.c
b/fs/cifs/file.c
index
d4890b6
..
579e41b
100644
(file)
--- a/
fs/cifs/file.c
+++ b/
fs/cifs/file.c
@@
-3366,7
+3366,7
@@
readpages_get_pages(struct address_space *mapping, struct list_head *page_list,
struct page *page, *tpage;
unsigned int expected_index;
int rc;
- gfp_t gfp =
mapping_gfp_constraint(mapping, GFP_KERNEL
);
+ gfp_t gfp =
readahead_gfp_mask(mapping
);
INIT_LIST_HEAD(tmplist);