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 6043CC00140 for ; Mon, 8 Aug 2022 19:35:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BCED94001D; Mon, 8 Aug 2022 15:35:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BDB1940018; Mon, 8 Aug 2022 15:35:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19E5094001D; Mon, 8 Aug 2022 15:35:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E4341940018 for ; Mon, 8 Aug 2022 15:35:36 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C92D81C63D4 for ; Mon, 8 Aug 2022 19:35:36 +0000 (UTC) X-FDA: 79777429872.02.A28968E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP id E5AB8C0136 for ; 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=wIlw5FNX3gdHLQFFPi6WZtVvC9jRyLN+M3rxcAEhghc=; b=ofwoH4hX44AnLQ+NA0aU5i2fnY Fng9H3/TW0vQk9TfKTg/Dil44Pb7EFLdQ1LEg6dRSkq3RHi+FMBl7CdvzPm2CzmxdtEKXvFdJhaQx H0RgoMJ5YjqgrnMf48dk28Huun5QcgYSIZPuM/eSWWEUpwQ1m9ZpdgE91LyVyXFGWaKrZIJvMbwdo xpQxavurKdRrjlB86Xoe5as1P0r6glNoabfJVjaXvboeLcddRGncXH+Y5XA3sdSrSN4edfuQY3EMd Uz0kjvci7xFI/ixs/cKsnMPAhLsHLvyRcu0kkmCPsYJ9vzIjuL922HDGeNSywff3Z8pwNbWZBFZLk jMoFuDcQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XD-00EAzU-So; Mon, 08 Aug 2022 19:35:34 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 41/59] mm: Remove lookup_swap_cache() Date: Mon, 8 Aug 2022 20:34:09 +0100 Message-Id: <20220808193430.3378317-42-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=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=wIlw5FNX3gdHLQFFPi6WZtVvC9jRyLN+M3rxcAEhghc=; b=M1tcx+xTsPqTNGn5UFOQZBmTatfUmUAf/J+WbB38epO5NpQz9PWfRNQIgBqoBUAax4gt3L 0AEEnWBa4QQyCplCLdt5+ToDS6jBGhkKW54doA5qYffizquJpG22xDybCJQGXVs/AN3DJ7 ukMH8VOXzLKwJMBdZzI5gYaWJFpJULA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ofwoH4hX; dmarc=none; spf=none (imf22.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=1659987336; a=rsa-sha256; cv=none; b=VRV3j9R4VMSDheXEwl70TWpEEewjSOZ5lzJ+LLamRgI2PbiCAZD7iFFg4ljL33+w/rRgTN SSVmaGKP7U2LYRwga34eZ93PN5kyQrCS2gvc8cRp4tpg8d7bzZLv9+n3XYEIrAVYYiGvEn DgL3BkJqRrYdfeDwTZHF8k2RGLgMXEI= Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ofwoH4hX; dmarc=none; spf=none (imf22.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam02 X-Stat-Signature: 65ec8pm9fqw1qi4n36ca8x1uh4hikhfs X-Rspamd-Queue-Id: E5AB8C0136 X-Rspam-User: X-HE-Tag: 1659987335-110237 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: All callers have now been converted to swap_cache_get_folio(), so we can remove this wrapper. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memcontrol.c | 2 +- mm/swap.h | 10 ---------- mm/swap_state.c | 12 +----------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f65833efe90d..3b0698faf1ee 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5561,7 +5561,7 @@ static struct page *mc_handle_swap_pte(struct vm_area_struct *vma, return NULL; /* - * Because lookup_swap_cache() updates some statistics counter, + * Because swap_cache_get_folio() updates some statistics counter, * we call find_get_page() with swapper_space directly. */ page = find_get_page(swap_address_space(ent), swp_offset(ent)); diff --git a/mm/swap.h b/mm/swap.h index f70ff34dab82..9551d7815c37 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -43,9 +43,6 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin, unsigned long end); struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_area_struct *vma, unsigned long addr); -struct page *lookup_swap_cache(swp_entry_t entry, - struct vm_area_struct *vma, - unsigned long addr); struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index); struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, @@ -103,13 +100,6 @@ static inline int swap_writepage(struct page *p, struct writeback_control *wbc) return 0; } -static inline struct page *lookup_swap_cache(swp_entry_t swp, - struct vm_area_struct *vma, - unsigned long addr) -{ - return NULL; -} - static inline struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index) { diff --git a/mm/swap_state.c b/mm/swap_state.c index b96bf4ec8b5b..4af135a7b53c 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -369,16 +369,6 @@ struct folio *swap_cache_get_folio(swp_entry_t entry, return folio; } -struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma, - unsigned long addr) -{ - struct folio *folio = swap_cache_get_folio(entry, vma, addr); - - if (!folio) - return NULL; - return folio_file_page(folio, swp_offset(entry)); -} - /** * find_get_incore_page - Find and get a page from the page or swap caches. * @mapping: The address_space to search. @@ -430,7 +420,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, int err; /* * First check the swap cache. Since this is normally - * called after lookup_swap_cache() failed, re-calling + * called after swap_cache_get_folio() failed, re-calling * that would confuse statistics. */ si = get_swap_device(entry); -- 2.35.1