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 9FCD1C6FA83 for ; Fri, 2 Sep 2022 19:26:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2736F800E8; Fri, 2 Sep 2022 15:26:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D59C800DD; Fri, 2 Sep 2022 15:26:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05088800E8; Fri, 2 Sep 2022 15:26:50 -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 E29AD800DD for ; Fri, 2 Sep 2022 15:26:50 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B4AF41604FE for ; Fri, 2 Sep 2022 19:26:50 +0000 (UTC) X-FDA: 79868127780.26.BBBEDED Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 680D780071 for ; Fri, 2 Sep 2022 19:26: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=BqtDNBokS9uyBPWuNbawImIMA3ufUINE/LSTsHWrTgg=; b=hYFLpoC4sAhHuD0Py9Ekqnw3Fj XPMn8zlUW69RvB3b7CafwyUjD8mwwMj1uzxa9FcIFKqj/ZBZWfZ4pTJYkD6mybTP7E46/nbnUQG75 jWu9JV/heCauIgTLF+Se8bVAcGqwfNnMwBoZ5Yz5dRNnps/y8fXz3R3tLkPZiiykoTUjbRT167Ehy 1MTyeyZp3HbdBzM9MjdaEfWQ1vAgF+rUjkpby1dzkN8b+pirg1FGPd+fWr3gOyyfhSvH8fm0lc82/ HpOMJ+mIN/9JH7OhM+Gaw4ZymI1RkDy2nbxWwiJozHoJcs5eYjpoyqSOTjpIpDWI9noB9m8g+SFCg DSxAWljw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCJP-007HuI-Ni; Fri, 02 Sep 2022 19:26:43 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton , linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Hugh Dickins Subject: [PATCH 2/2] vmscan: Check folio_test_private(), not folio_get_private() Date: Fri, 2 Sep 2022 20:26:39 +0100 Message-Id: <20220902192639.1737108-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902192639.1737108-1-willy@infradead.org> References: <20220902192639.1737108-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=1662146810; 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=BqtDNBokS9uyBPWuNbawImIMA3ufUINE/LSTsHWrTgg=; b=3r/c+jl/nv83Wecc6xMPCHvdPfMsHvUTeq0rEil4PKfVCzVjA5mIcsX+MK7uNjp1rzsV1R u8QKNgO4yX8xJ+C7DugjPuGYmC2RPxA8uzWFAGxKihm/Q6AxA4MfyChRV+6zdTwszyXEoN 4uDRG53grmExgeAPXHmSARTqMXQGvcg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hYFLpoC4; spf=none (imf30.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=1662146810; a=rsa-sha256; cv=none; b=u7FRgzReJm7wqCzb2U8kEFN7iG5D8ttVwCt2BR3TJDGYDVlHPYV2jQ0i8JBN6ybGqk7CXT ARiEXML5U7VBmU3VPUKiIwKw713/pMVlIw7yssUAMR1HHjHl4IR4702FrASpu26+HlnA4S f60q9AXBPGNySMl/USMVuUhmDYfoL5U= Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hYFLpoC4; spf=none (imf30.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-Rspamd-Server: rspam08 X-Stat-Signature: jnkbeun7tnyjuemm17zfrmadspcn5793 X-Rspamd-Queue-Id: 680D780071 X-Rspam-User: X-HE-Tag: 1662146810-926086 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: These two predicates are the same for file pages, but are not the same for anonymous pages. Reported-by: Hugh Dickins Fixes: 07f67a8dedc0 ("mm/vmscan: convert shrink_active_list() to use a folio") Signed-off-by: Matthew Wilcox (Oracle) --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b2b1431352dc..382dbe97329f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2550,8 +2550,8 @@ static void shrink_active_list(unsigned long nr_to_scan, } if (unlikely(buffer_heads_over_limit)) { - if (folio_get_private(folio) && folio_trylock(folio)) { - if (folio_get_private(folio)) + if (folio_test_private(folio) && folio_trylock(folio)) { + if (folio_test_private(folio)) filemap_release_folio(folio, 0); folio_unlock(folio); } -- 2.35.1