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 AE5DAC433FE for ; Fri, 29 Apr 2022 19:24:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7897F6B0089; Fri, 29 Apr 2022 15:23:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E8506B008C; Fri, 29 Apr 2022 15:23:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53AC76B0092; Fri, 29 Apr 2022 15:23:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 3DA316B0089 for ; Fri, 29 Apr 2022 15:23:53 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D7B04BBC for ; Fri, 29 Apr 2022 19:23:51 +0000 (UTC) X-FDA: 79410891462.25.3E50238 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 86E232003D for ; Fri, 29 Apr 2022 19:23:42 +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=X+gO3T14DbfhD7ZSFY3GZUXu8JvQaqrsZFRii8darF0=; b=tCy+1uOVAgy5BKSJbLvt5D1u7k xmHkulmiKtu2xNzlaUhqPxzFJpeu3fPK/VrSKzBe02Xm766iTb/f/eAmbii2GK31k/GT9XwoO0r2A HU+s+Cm3C2DqUjYatA9V2H0USIjvHGF32T/x/zKqECzpXBcB6yRwOGIp3CU52pqHcfddwRzdEWNJG k/QjSSKwjKIi9S622QEzr6IwBmxKijV4CKdIiQp/3kHf/uUZxpPmewx9KUMdSRpWOS0d/QMltN8oN xQcT/GNd9ticFC2h6Cl0/ypJp5luP8D/Gu+qkU7Xa8jLiIBv4Zi19iqHxdJNn2ybMieZm3fsfvf2F gKyJTibQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkWDJ-00CjOm-9l; Fri, 29 Apr 2022 19:23:37 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 04/21] vmscan: Use folio_mapped() in shrink_page_list() Date: Fri, 29 Apr 2022 20:23:12 +0100 Message-Id: <20220429192329.3034378-5-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220429192329.3034378-1-willy@infradead.org> References: <20220429192329.3034378-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: hceb46bn78jjhdmsta66yfi8prbafuuk X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 86E232003D X-Rspam-User: Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=tCy+1uOV; dmarc=none; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1651260222-532534 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: Remove some legacy function calls. Signed-off-by: Matthew Wilcox (Oracle) --- mm/vmscan.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 1678802e03e7..27be6f9b2ba5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1549,7 +1549,7 @@ static unsigned int shrink_page_list(struct list_head *page_list, if (unlikely(!page_evictable(page))) goto activate_locked; - if (!sc->may_unmap && page_mapped(page)) + if (!sc->may_unmap && folio_mapped(folio)) goto keep_locked; may_enter_fs = (sc->gfp_mask & __GFP_FS) || @@ -1743,21 +1743,21 @@ static unsigned int shrink_page_list(struct list_head *page_list, } /* - * The page is mapped into the page tables of one or more + * The folio is mapped into the page tables of one or more * processes. Try to unmap it here. */ - if (page_mapped(page)) { + if (folio_mapped(folio)) { enum ttu_flags flags = TTU_BATCH_FLUSH; - bool was_swapbacked = PageSwapBacked(page); + bool was_swapbacked = folio_test_swapbacked(folio); - if (PageTransHuge(page) && - thp_order(page) >= HPAGE_PMD_ORDER) + if (folio_test_pmd_mappable(folio)) flags |= TTU_SPLIT_HUGE_PMD; try_to_unmap(folio, flags); - if (page_mapped(page)) { + if (folio_mapped(folio)) { stat->nr_unmap_fail += nr_pages; - if (!was_swapbacked && PageSwapBacked(page)) + if (!was_swapbacked && + folio_test_swapbacked(folio)) stat->nr_lazyfree_fail += nr_pages; goto activate_locked; } -- 2.34.1