From 057758bc947f8165b550fcc16ab0971854182b10 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Thu, 3 Apr 2008 23:35:22 +0100
Subject: [PATCH] --- yaml --- r: 88111 b: refs/heads/master c:
 4cd13504652d28e16bf186c6bb2bbb3725369383 h: refs/heads/master i:   88109:
 675d123ebb4ec5c8103926c873db980976026f2a   88107:
 0942226d1331fbd321f458c20bfe2ddf205d4759   88103:
 6d339b368c732aed16550969f7f674f26b7a7294   88095:
 1bda9a71c2350b107cd1a2af558a8cbbdf6034dd v: v3

---
 [refs]            | 2 +-
 trunk/fs/splice.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7db50073f59e..c359353afd44 100644
--- 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
index 0670c915cd35..a861bb318ac8 100644
--- 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)