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 07775C433EF for ; Wed, 4 May 2022 18:29:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE3566B0082; Wed, 4 May 2022 14:29:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A2E76B0081; Wed, 4 May 2022 14:29:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11A676B0081; Wed, 4 May 2022 14:29:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BE1496B0073 for ; Wed, 4 May 2022 14:29:04 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9F9642131A for ; Wed, 4 May 2022 18:29:04 +0000 (UTC) X-FDA: 79428897408.07.A9CC2DE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 14E51A0081 for ; Wed, 4 May 2022 18:28:50 +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=fnCEP8MhL/Yc7jTk+rt/jf8cqO uGy1/bvfLvu7KdVi2MXXDnAUvoo6UxEq0v8cI199qrP0oIBIpC9JB16OH+OOjwOmUAWeNKk5qbXfW 3pt5bl20oHtKMRawXZyqRRGES75lM9JHdaVDIxXOaNd0ojf1Mc/kzFbPdZAnU18BABo5XK2k0gPqM 0hGJcv+pZ8aeQI5u7+WU+RmI5yBBFnoCJ4owgeJzpBLPd+j4hl+ttvTUdRDoX9Z99BqdfkKrPC+Xj GmwKjn0H2tD0gu7q9bcVw801KDjCcbqfZDq9drZWvZkuqxRIvMDiJW9Yqk1tzOb6AB/vEkXLbSsva Dd9QrWIA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmJkE-00Gq6B-4L; Wed, 04 May 2022 18:29:02 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 05/26] vmscan: Use folio_mapped() in shrink_page_list() Date: Wed, 4 May 2022 19:28:36 +0100 Message-Id: <20220504182857.4013401-6-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220504182857.4013401-1-willy@infradead.org> References: <20220504182857.4013401-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 14E51A0081 X-Stat-Signature: c3z37iuf1ektqod9g4frfdee94iqtikr Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=fnCEP8Mh; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1651688930-874582 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