From: Wang Sheng-Hui Date: Wed, 6 Aug 2014 23:07:26 +0000 (-0700) Subject: mm/shmem.c: remove the unused gfp arg to shmem_add_to_page_cache() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fed400a181447ba975d40e1df5e0d555eae51795;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git mm/shmem.c: remove the unused gfp arg to shmem_add_to_page_cache() The gfp arg is not used in shmem_add_to_page_cache. Remove this unused arg. Signed-off-by: Wang Sheng-Hui Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/shmem.c b/mm/shmem.c index fe15d96c3166..302d1cf7ad07 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -293,7 +293,7 @@ static bool shmem_confirm_swap(struct address_space *mapping, */ static int shmem_add_to_page_cache(struct page *page, struct address_space *mapping, - pgoff_t index, gfp_t gfp, void *expected) + pgoff_t index, void *expected) { int error; @@ -666,7 +666,7 @@ static int shmem_unuse_inode(struct shmem_inode_info *info, */ if (!error) error = shmem_add_to_page_cache(*pagep, mapping, index, - GFP_NOWAIT, radswap); + radswap); if (error != -ENOMEM) { /* * Truncation and eviction use free_swap_and_cache(), which @@ -1112,7 +1112,7 @@ repeat: gfp & GFP_RECLAIM_MASK); if (!error) { error = shmem_add_to_page_cache(page, mapping, index, - gfp, swp_to_radix_entry(swap)); + swp_to_radix_entry(swap)); /* * We already confirmed swap under page lock, and make * no memory allocation here, so usually no possibility @@ -1175,7 +1175,7 @@ repeat: error = radix_tree_maybe_preload(gfp & GFP_RECLAIM_MASK); if (!error) { error = shmem_add_to_page_cache(page, mapping, index, - gfp, NULL); + NULL); radix_tree_preload_end(); } if (error) {