Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755395Ab3HWLGV (ORCPT ); Fri, 23 Aug 2013 07:06:21 -0400 Received: from mail-ie0-f181.google.com ([209.85.223.181]:53085 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752700Ab3HWLGU (ORCPT ); Fri, 23 Aug 2013 07:06:20 -0400 MIME-Version: 1.0 Date: Fri, 23 Aug 2013 19:06:20 +0800 Message-ID: Subject: [PATCH 2/4] zswap: use GFP_NOIO instead of GFP_KERNEL From: Weijie Yang To: Minchan Kim , Bob Liu , sjenning@linux.vnet.ibm.com Cc: weijie.yang@samsung.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1296 Lines: 45 avoid zswap store and reclaim functions called recursively. --- mm/zswap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 1cf1c07..5f97f4f 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -427,7 +427,7 @@ static int zswap_get_swap_cache_page(swp_entry_t entry, * Get a new page to read into from swap. */ if (!new_page) { - new_page = alloc_page(GFP_KERNEL); + new_page = alloc_page(GFP_NOIO); if (!new_page) break; /* Out of memory */ } @@ -435,7 +435,7 @@ static int zswap_get_swap_cache_page(swp_entry_t entry, /* * call radix_tree_preload() while we can wait. */ - err = radix_tree_preload(GFP_KERNEL); + err = radix_tree_preload(GFP_NOIO); if (err) break; @@ -628,7 +628,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset, } /* allocate entry */ - entry = zswap_entry_cache_alloc(GFP_KERNEL); + entry = zswap_entry_cache_alloc(GFP_NOIO); if (!entry) { zswap_reject_kmemcache_fail++; ret = -ENOMEM; -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/