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 730DDC433FE for ; Wed, 19 Oct 2022 18:33:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15AFD6B0078; Wed, 19 Oct 2022 14:33:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10DC66B007B; Wed, 19 Oct 2022 14:33:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F16346B007D; Wed, 19 Oct 2022 14:33:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E29126B0078 for ; Wed, 19 Oct 2022 14:33:43 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C43D6AA6C3 for ; Wed, 19 Oct 2022 18:33:43 +0000 (UTC) X-FDA: 80038547526.26.251E5E3 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 5040C80037 for ; Wed, 19 Oct 2022 18:33:43 +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=IrOttttUPiKuZ3hswuR449OfevtoU6vRD5zzMkrsi1c=; b=P8O+/TfX4IlpduU0MNrnBqVi20 Lq2mxDJNDJTSNaWeqTE+KNqkaAOFnutkjE94uay+fsAmq7gAMJVv5pgr0Tvs5ZzNRuaHhWRn3zqEs Z/IOJsrnQiA3H+rEOPMOeQEGUEXX/oz0dexOyJ2yykVYAS/C8e7OlNTFL+pot48wVicvcHo7oEgP6 Xoqj3ih4UiKzZkii55YhyeeEivJxn3De2/xJWKCVzgeqTBVnJWqVaALCw2PTC24kl+9+Mt1ikDpTG zrhZl7zX+RyJi4hWeoOOnh9ailz+V8eKlLw9mlIN+g7UiahplZDRdI9SCwqUT7m/I3uWXfhxaAz3N JF8Xs7gA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1olDsm-00BkzE-NL; Wed, 19 Oct 2022 18:33:36 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 2/4] mm/swap: Convert find_get_incore_page to use folios Date: Wed, 19 Oct 2022 19:33:30 +0100 Message-Id: <20221019183332.2802139-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221019183332.2802139-1-willy@infradead.org> References: <20221019183332.2802139-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666204423; a=rsa-sha256; cv=none; b=ARkNHswndu3xA7YEqTD5ayOhh6d+heKFPPeGpetGmI30k3n0ZLlnTwWH7FhoRUoaP3ItVy CBTFxwBAW/tykbTI18rdBP6CEXU82oBHOvZtfmfsDm9dArxbdICQNt3rijHMfVRr8zDvav F7td0n47TCXtF43gcNuN3mWjjqPZNsU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="P8O+/TfX"; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666204423; 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=IrOttttUPiKuZ3hswuR449OfevtoU6vRD5zzMkrsi1c=; b=2zZUf2xJ9AwIR6ktU00pBu6kt3+qpWGZcw6XRcVmoyfME7blOKI2NO0QtcmaQ2NBvL7IUC 0FEi+UPimO02BB09yPxYELEQ2rkXOOhnzM/hOJXo8vtYmdAcY+QYiyadyt4HGjziowNLHS 5zuXKbKv/ZWo/yFjXuo31zRQDfHgTiQ= X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="P8O+/TfX"; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Stat-Signature: uuzwjg8if3u6wxmiz1ua5hufqhdzoga1 X-Rspamd-Queue-Id: 5040C80037 X-Rspamd-Server: rspam10 X-HE-Tag: 1666204423-743318 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: Eliminates a use of FGP_HEAD and saves 35 bytes of text. Signed-off-by: Matthew Wilcox (Oracle) --- mm/swap_state.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 438d0676c5be..44e3530520e8 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -386,17 +386,14 @@ struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index) { swp_entry_t swp; struct swap_info_struct *si; - struct page *page = pagecache_get_page(mapping, index, - FGP_ENTRY | FGP_HEAD, 0); + struct folio *folio = __filemap_get_folio(mapping, index, FGP_ENTRY, 0); - if (!page) - return page; - if (!xa_is_value(page)) - return find_subpage(page, index); + if (!xa_is_value(folio)) + goto out; if (!shmem_mapping(mapping)) return NULL; - swp = radix_to_swp_entry(page); + swp = radix_to_swp_entry(folio); /* There might be swapin error entries in shmem mapping. */ if (non_swap_entry(swp)) return NULL; @@ -404,9 +401,13 @@ struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index) si = get_swap_device(swp); if (!si) return NULL; - page = find_get_page(swap_address_space(swp), swp_offset(swp)); + index = swp_offset(swp); + folio = filemap_get_folio(swap_address_space(swp), index); put_swap_device(si); - return page; +out: + if (!folio) + return NULL; + return folio_file_page(folio, index); } struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, -- 2.35.1