summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2008-04-03 23:35:22 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-03 15:39:49 -0700
commit4cd13504652d28e16bf186c6bb2bbb3725369383 (patch)
tree2bc557b5a3c92954fabea3cb6217d1373bbedaa4 /fs
parent9597362d354f8655ece324b01d0c640a0e99c077 (diff)
downloadop-kernel-dev-4cd13504652d28e16bf186c6bb2bbb3725369383.zip
op-kernel-dev-4cd13504652d28e16bf186c6bb2bbb3725369383.tar.gz
splice: use mapping_gfp_mask
The loop block driver is careful to mask __GFP_IO|__GFP_FS out of its mapping_gfp_mask, to avoid hangs under memory pressure. But nowadays it uses splice, usually going through __generic_file_splice_read. That must use mapping_gfp_mask instead of GFP_KERNEL to avoid those hangs. Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/splice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 0670c91..a861bb3 100644
--- a/fs/splice.c
+++ b/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)
OpenPOWER on IntegriCloud