projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-block.git]
/
fs
/
ext4
/
inode.c
diff --git
a/fs/ext4/inode.c
b/fs/ext4/inode.c
index e8d620a484f6a86bb684ce432888c329a429e948..7d1aad1d9313155f3780cde3923710fe7f60ea1c 100644
(file)
--- a/
fs/ext4/inode.c
+++ b/
fs/ext4/inode.c
@@
-3386,7
+3386,7
@@
static int __ext4_block_zero_page_range(handle_t *handle,
int err = 0;
page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT,
- mapping_gfp_
mask(mapping) & ~__GFP_FS
);
+ mapping_gfp_
constraint(mapping, ~__GFP_FS)
);
if (!page)
return -ENOMEM;