The patch titled fs/splice.c: fix mapping_gfp_mask usage has been added to the -mm tree. Its filename is fs-splicec-fix-mapping_gfp_mask-usage.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/splice.c: fix mapping_gfp_mask usage From: Nick Piggin <npiggin@xxxxxxx> 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@xxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/splice.c~fs-splicec-fix-mapping_gfp_mask-usage fs/splice.c --- a/fs/splice.c~fs-splicec-fix-mapping_gfp_mask-usage +++ a/fs/splice.c @@ -320,7 +320,7 @@ __generic_file_splice_read(struct file * 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) _ Patches currently in -mm which might be from npiggin@xxxxxxx are origin.patch linux-next.patch fs-splicec-fix-mapping_gfp_mask-usage.patch reiser4.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html