---

yaml --- r: 88111 b: refs/heads/master c: 4cd1350 h: refs/heads/master i: 88109: 675d123 88107: 0942226 88103: 6d339b3 88095: 1bda9a7 v: v3
git-mirror · Apr 3, 2008 · 057758b · 057758b
1 parent 198b31b
commit 057758b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9597362d354f8655ece324b01d0c640a0e99c077
+refs/heads/master: 4cd13504652d28e16bf186c6bb2bbb3725369383
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -320,7 +320,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
 				break;
 
 			error = add_to_page_cache_lru(page, mapping, index,
-					      GFP_KERNEL);
+						mapping_gfp_mask(mapping));
 			if (unlikely(error)) {
 				page_cache_release(page);
 				if (error == -EEXIST)