Message ID | 20220808193430.3378317-41-willy@infradead.org (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 0BEE4C25B08 for <linux-mm@archiver.kernel.org>; Mon, 8 Aug 2022 19:35:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DCDB94001C; Mon, 8 Aug 2022 15:35:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A0AD940018; Mon, 8 Aug 2022 15:35:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 719A794001C; Mon, 8 Aug 2022 15:35:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5B571940018 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 15:35:36 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3BC3540D84 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 19:35:36 +0000 (UTC) X-FDA: 79777429872.15.2273100 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id C75B1A0050 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 19:35:35 +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=IcQHBc7Dn05IEjQ1QkZofVBHDYD9coNpNeAa/u7bGVY=; b=T25EZ42yinyKx+QV8R7zXPhdl8 Jk1o8WzfTKlTVsULC4hm1l8lgpMWHJewEPaeiqvhq9odTtlD3PIOotrA1poMd0j7JohcliXtiAXPY qKLd15WnqhMzkk6MQ+fML9tyNVzAa6NmR2GrBxeEUhPX6gC3pIant8E0HrSCAG20sPc1Op6KBUA0F Ga7PmFe45LB9YjMtsboVmMXdpIUnOfHoYUA3sruWfY94PHtLBMxo9N0W/gllLbIdsRu5jVrEUEeDE 0Ixfb6F6GHE+nj9BCHigetBsB4J+W/7wKO4VBQqJTJSCcJyJPkY/u5Vk5wILeZRDwZm8+C9Jvhj6A yVurSbFQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XD-00EAzM-Ez; Mon, 08 Aug 2022 19:35:31 +0000 From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, hughd@google.com Subject: [PATCH 40/59] mm: Convert do_swap_page() to use swap_cache_get_folio() Date: Mon, 8 Aug 2022 20:34:08 +0100 Message-Id: <20220808193430.3378317-41-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-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=T25EZ42y; spf=none (imf15.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987335; a=rsa-sha256; cv=none; b=Jaucz7vT68bTgwDzMb/YmXdzS1nvDxc+LR4RYvqa/7bfnwcQGiVWr67iHj4MCSzyMXanQd YAVnVjZtRciUssstKBcLh0vynkCI/COidEyeuZc2pTS7TZLzx1qBS76TgFDRsKeeYvMgfM 1GgPfgVje0lnwHgXNBOjYGF91IgE+8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987335; 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=IcQHBc7Dn05IEjQ1QkZofVBHDYD9coNpNeAa/u7bGVY=; b=VVjeJ+iCtLZ2h0AtFXbKf6mtvik/7f2hfFswpMJLycGDzXag+rnt+sXvrVmksKcumy35li 7546vsG6Avg+75cL6t+i3mVKde2kR1wFOtjPki2YTzQYIHgOfce52qkNBJ7ZwQMPDTGCfp PTKNxYH+TCoYyyJRaPCXTrB53DP5Pg8= X-Stat-Signature: x7biiss3zt47mr1hrqgpxhoea65q87zz X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C75B1A0050 Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=T25EZ42y; spf=none (imf15.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-HE-Tag: 1659987335-56060 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: <linux-mm.kvack.org> |
Series |
MM folio changes for 6.1
|
expand
|
diff --git a/mm/memory.c b/mm/memory.c index 23b164bf3c70..5465037c237c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3761,9 +3761,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (unlikely(!si)) goto out; - page = lookup_swap_cache(entry, vma, vmf->address); - if (page) - folio = page_folio(page); + folio = swap_cache_get_folio(entry, vma, vmf->address); + if (folio) + page = folio_file_page(folio, swp_offset(entry)); swapcache = folio; if (!folio) {
Saves a folio->page->folio conversion. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)