From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFCDCC433FE for ; Wed, 4 May 2022 18:29:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E7366B0096; Wed, 4 May 2022 14:29:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F5286B009B; Wed, 4 May 2022 14:29:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF56B6B0092; Wed, 4 May 2022 14:29:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 318CB6B0087 for ; Wed, 4 May 2022 14:29:06 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1421F1656 for ; Wed, 4 May 2022 18:29:06 +0000 (UTC) X-FDA: 79428897492.12.1C1872D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf19.hostedemail.com (Postfix) with ESMTP id 6E9921A008B for ; Wed, 4 May 2022 18:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=uabWLQ5m8/94bMf9QUU5RwciH7K0ufNKxK4Ld1Z9V+4=; b=eOTFXQQwjIGVJgswvkNK8Ji6kA 4uToUC2z/hSAUSuafgIFM6qgaIGXcnn4Cw1Kg31Jt3ImlxkzxNVnXlh5JhWiOH9vmWeQO7ktEJVAk vIhT6m1Z6UlMUDo1SkHW3rI3OlEKECMgLeYk8XBsPJOBLv7atCe1FopRLeqDqGanJ83V4+MJ4N0Ml IfK58TdSYJv6eA3wB+wH6G38R0Uwxrlo4kbYszOWelbpu3RPRJFC3cS7LdWx51zDN4+dBuW0R2wg7 oceN5/GmKG38W8dl0X9XwH1dNg9hsweSGe/K+NXxtu+4cNuoXWbid1jjsnTBduVvLHKzQg1BxtLxP DlvblsUA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmJkG-00Gq8J-7C; Wed, 04 May 2022 18:29:04 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 19/26] mm/shmem: Turn shmem_should_replace_page into shmem_should_replace_folio Date: Wed, 4 May 2022 19:28:50 +0100 Message-Id: <20220504182857.4013401-20-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220504182857.4013401-1-willy@infradead.org> References: <20220504182857.4013401-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6E9921A008B X-Stat-Signature: 8odzmtq744ngssidiuu3ekyt73pamkhi Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eOTFXQQw; dmarc=none; spf=none (imf19.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-HE-Tag: 1651688939-260744 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is a straightforward conversion. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index f77456aaae96..7946ccbc60bf 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1600,9 +1600,9 @@ static struct page *shmem_alloc_and_acct_page(gfp_t gfp, * NUMA mempolicy, and applied also to anonymous pages in do_swap_page(); * but for now it is a simple matter of zone. */ -static bool shmem_should_replace_page(struct page *page, gfp_t gfp) +static bool shmem_should_replace_folio(struct folio *folio, gfp_t gfp) { - return page_zonenum(page) > gfp_zone(gfp); + return folio_zonenum(folio) > gfp_zone(gfp); } static int shmem_replace_page(struct page **pagep, gfp_t gfp, @@ -1734,13 +1734,13 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, */ arch_swap_restore(swap, page); - if (shmem_should_replace_page(page, gfp)) { + folio = page_folio(page); + if (shmem_should_replace_folio(folio, gfp)) { error = shmem_replace_page(&page, gfp, info, index); if (error) goto failed; } - folio = page_folio(page); error = shmem_add_to_page_cache(folio, mapping, index, swp_to_radix_entry(swap), gfp, charge_mm); -- 2.34.1