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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ntfs
/
file.c
diff --git
a/fs/ntfs/file.c
b/fs/ntfs/file.c
index 262561fea923aa2315cffe91af91d12b399ded8c..9d383e5eff0ea5519bffb34528b5aeccbe6f3831 100644
(file)
--- a/
fs/ntfs/file.c
+++ b/
fs/ntfs/file.c
@@
-525,8
+525,8
@@
static inline int __ntfs_grab_cache_pages(struct address_space *mapping,
}
}
err = add_to_page_cache_lru(*cached_page, mapping,
-
index,
-
GFP_KERNEL & mapping_gfp_mask(mapping
));
+ index,
+
mapping_gfp_constraint(mapping, GFP_KERNEL
));
if (unlikely(err)) {
if (err == -EEXIST)
continue;