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 ED86EC00140 for ; Mon, 8 Aug 2022 19:35:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 216F194000F; Mon, 8 Aug 2022 15:35:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B40F940007; Mon, 8 Aug 2022 15:35:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D0D1794000F; Mon, 8 Aug 2022 15:35:19 -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 7E346940012 for ; Mon, 8 Aug 2022 15:35:19 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 680FBA046F for ; Mon, 8 Aug 2022 19:35:19 +0000 (UTC) X-FDA: 79777429158.21.A15C711 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id F1492160172 for ; Mon, 8 Aug 2022 19:35:18 +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=m7JOJji/bhVJxkubfkFOhgpm23cyZZ+v/2pPI0vnz+o=; b=rM9ymd/lXI8jTym5/BlNuAHJrQ ghpNY7LTpfUKeyS+RFSkf+OQiE4GtZGL78H+aste515lcE0Q9QjITSoGEEVoshdac4RXqFx7neM+i ut2Burm5HEA/YwWNNViEo25jPFZPPf0oTK2RiFlCR90X3l1vNh1USlsCYfA8F8c9vhe/FusHw1V5H wp35ybgLi/KOnQKNb8xBwFj3ZlG2+g8UbHAJb5LTs1gX1V4uji7qLPJu5AED6E9v5ZtEjci4rkYQR y65Tn7/tas+kNWpsUG3diww0aD62ldAINd0SrApnJvyMsZZ6S1PvRhL+clbNh+Db/+XVQqyaQc3bv 68Dr794Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8Wz-00EAw3-B7; Mon, 08 Aug 2022 19:35:17 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 21/59] shmem: Convert shmem_replace_page() to shmem_replace_folio() Date: Mon, 8 Aug 2022 20:33:49 +0100 Message-Id: <20220808193430.3378317-22-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987319; 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=m7JOJji/bhVJxkubfkFOhgpm23cyZZ+v/2pPI0vnz+o=; b=NcqXlhgezL/6JKGum/sOK5T8hUgVDK7umk70+nonGOorMNWelzH7ptRPn6dtZHIGHQXkoU hzZiRomIQBYxAdqLqj/CRAUVhslSQcY1VCyU3G3rtBGu9LImY+bX49eKk0KDOfPC/xJOBP 0fA3vtefQ+CooOMokQImnBaZQw2mHEw= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="rM9ymd/l"; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987319; a=rsa-sha256; cv=none; b=NlO2gRKPMgL06rfar7UYmWGex+We911CVNZk5YPXOzkZJmV41cwIpCHAZ1yUmDRnEUnn3C mTFJSZFeQyKwb2wPo4t18woLENtb8IiYsTuH7BJ9+RqnP1Laipw4csU+B4HvcRz1TITlWl ScjTHE2N2pVnxktSWEmNe/njYwF615I= X-Rspamd-Queue-Id: F1492160172 X-Rspamd-Server: rspam03 X-Rspam-User: Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="rM9ymd/l"; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Stat-Signature: e331orp1gee597617ga33s7atb6skka3 X-HE-Tag: 1659987318-957682 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 e7fd1dfb2895..ac2b2ebfc9c9 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); @@ -1664,7 +1664,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); @@ -1770,8 +1770,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