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 67C87ECAAD5 for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82231800ED; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75EE4800DD; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 510C8800EF; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2556B800EB for ; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EEA58C0529 for ; Fri, 2 Sep 2022 19:46:59 +0000 (UTC) X-FDA: 79868178558.25.507BBBE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id A28CF4004F for ; Fri, 2 Sep 2022 19:46: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=thf7apzdSr3NOuHUHzgvwosLzIF/+7M4T316bLt6cLU=; b=OKLNtOnuI9kUo/Di5ldun07t07 Pnup/VwBgMkv6bB7tQ1Vzi1SF5jZK2fmr+zKvACX8OwO3JCMkA8Z1bpcCI0mJz8jprdue3iRRAIai dB2U3GdI+yQ29uL3KomHJ6lloOSiQ7TnkOMr6p/qGOoZxr96WQq/LGEuUR36JLXKZU4uyonQCnbKW TV9svXDXdorxuUQVx+F4p+bpLGFh/sKSYk9fD68mKOKdi5iFkBwroE+kjJqzZdu6uVkJ1xAxSTShW +RsXCDczQ2bWNA+3ozicn09AgdTRMBOuvdNUw4mf4kKP8ndDWJD/tpqoHs0F6RZUMptiuLkQv7/d7 M+WLXlFA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd1-007Icc-G2; Fri, 02 Sep 2022 19:46:59 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 18/57] shmem: Convert shmem_replace_page() to shmem_replace_folio() Date: Fri, 2 Sep 2022 20:46:14 +0100 Message-Id: <20220902194653.1739778-19-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148019; a=rsa-sha256; cv=none; b=czDisaXRFX9BgLlw6c19Fq99hR26kVtvMtfZuguoEUeND+GB5mz+EDVwHVYrNo3jDuTZLq v+0FTgvbWS1el407vo0ed2j4jr1skUNDYcnvKuzf4VQ5YrBm7q/c3SdfMIrG1O157lf8wU Snrqukm209A15Zy62l6qZWrKGWcN54w= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=OKLNtOnu; dmarc=none; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148019; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=thf7apzdSr3NOuHUHzgvwosLzIF/+7M4T316bLt6cLU=; b=ltr/LweJ+tWDuVtUf2hQDR9fyMPO3wCytvX4NlsNpph5PjQ32xjzPICIiqFVzSVHrzNIf2 UNmkjGpvNkHBkbOOu5HN7zaYZ7LtVd8fWeIyU5eRaXx8dIbxMAi+wMepIOYcb/PDfHcpIy FUJ47Vu8FkjJf+h8u17D6O2c82tAO6c= X-Stat-Signature: qyp1ur5sw5wc151czdwtzuqwmphmgj8x X-Rspamd-Queue-Id: A28CF4004F Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=OKLNtOnu; dmarc=none; spf=none (imf11.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-Rspamd-Server: rspam02 X-HE-Tag: 1662148019-207797 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: The caller has a folio, so convert the calling convention and rename the function. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 8754e2b4800a..2bb6f5cfdc11 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1608,7 +1608,7 @@ static bool shmem_should_replace_folio(struct folio *folio, gfp_t gfp) return folio_zonenum(folio) > gfp_zone(gfp); } -static int shmem_replace_page(struct page **pagep, gfp_t gfp, +static int shmem_replace_folio(struct folio **foliop, gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { struct folio *old, *new; @@ -1617,7 +1617,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, pgoff_t swap_index; int error; - old = page_folio(*pagep); + old = *foliop; entry = folio_swap_entry(old); swap_index = swp_offset(entry); swap_mapping = swap_address_space(entry); @@ -1666,7 +1666,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, old = new; } else { folio_add_lru(new); - *pagep = &new->page; + *foliop = new; } folio_clear_swapcache(old); @@ -1772,8 +1772,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, arch_swap_restore(swap, folio); if (shmem_should_replace_folio(folio, gfp)) { - error = shmem_replace_page(&page, gfp, info, index); - folio = page_folio(page); + error = shmem_replace_folio(&folio, gfp, info, index); if (error) goto failed; } -- 2.35.1