diff --git a/[refs] b/[refs]
index 239d36ce5521..b8b0e6073d9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b574480507460b8e31b8d38dd4642219fc3b9a10
+refs/heads/master: f4a01017d678fe4baecf480e79d7c4f4b7ebc772
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 60a26f3a6f8b..9760ba09275e 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -3583,7 +3583,8 @@ int ext4_block_truncate_page(handle_t *handle,
 	struct page *page;
 	int err = 0;
 
-	page = grab_cache_page(mapping, from >> PAGE_CACHE_SHIFT);
+	page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT,
+				   mapping_gfp_mask(mapping) & ~__GFP_FS);
 	if (!page)
 		return -EINVAL;