Commit 0ae0b5d0 authored May 25, 2010 by Nick Piggin Committed by Jens Axboe May 25, 2010

fs/splice.c: fix mapping_gfp_mask usage



mapping_gfp_mask() is not supposed to store allocation contex details,
only page location details.  So mapping_gfp_mask should be applied to the
pagecache page allocation, wheras normal (kernel mapped) memory should be
used for surrounding allocations such as radix-tree nodes allocated by
add_to_page_cache.  Context modifiers should be applied on a per-callsite
basis.

So change splice to follow this convention (which is followed in similar
code patterns in core code).

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

parent d02a2c07

fs/splice.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ __generic_file_splice_read(struct file in, loff_t ppos,
		break;

		error = add_to_page_cache_lru(page, mapping, index,
		mapping_gfp_mask(mapping));
		GFP_KERNEL);
		if (unlikely(error)) {
		page_cache_release(page);
		if (error == -EEXIST)

Admin message