From patchwork Mon Jun 11 14:06:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10457963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF2B1601A0 for ; Mon, 11 Jun 2018 14:09:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7F4A2835B for ; Mon, 11 Jun 2018 14:09:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABE2928451; Mon, 11 Jun 2018 14:09:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EA0C2835B for ; Mon, 11 Jun 2018 14:09:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2225F6B028B; Mon, 11 Jun 2018 10:07:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 155FF6B028C; Mon, 11 Jun 2018 10:07:03 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE9936B028D; Mon, 11 Jun 2018 10:07:02 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id A6F886B028C for ; Mon, 11 Jun 2018 10:07:02 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id j14-v6so10300132pfn.11 for ; Mon, 11 Jun 2018 07:07:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=cp1noagiBNyq9HAsILQXj5VlZgjwOoF7k27YeP6vh0Y=; b=FlNykA0UDoLmiUzmSpWfGPJ5076VTuV47m6Spg7I9KuN2dYN+DjMzG0P23TaDjOxYW +seLYW8AJvSQ279HMx+lJ3DuSpiZ/goxFzg43BH/len4AQ4LpTYVQynWx1Sdurcf+RLJ y0Beai9INTytXZeigPRX52jAiqQdFJLRsSqSFD4NnoaF5g8BMsI6IC+PGdlmipqg1hxj QRxWuaQ+IDn4j7/ez7ahDFWI1rG6tWVTgsfHcUH/QiDZQ+Wx/KMwSFgdb/sciJiUPajj PuQTCzUK5zrVgSl1VkaTiEhWkoGXKx8aA9dB0e6PEXKTDv7K+IKYCIr5gvtRvazBwJUo 0arw== X-Gm-Message-State: APt69E0G9z4DMb/P1LPw0pZEYb9WxuEXnRGwmlf1hD4CJaYZDwK/F9BI VJ/2V9ydMgKflRqzPGfjvOlRPLLl9kGmmO9L+tbq4GMWD28lhL6uBhGW/Cjwnr1zYm6JnaoVRXY O1x9Y8BH3EXiKyjqZREofthcWh2dky6lj38T0W8ZjtUYrjGyCXN4m+gkcMh55nXi/pg== X-Received: by 2002:a17:902:7d09:: with SMTP id z9-v6mr18630766pll.233.1528726022383; Mon, 11 Jun 2018 07:07:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJjDHzsCdTPoIeWj8hOnsFE2iOUY7RLvGx6x4M1cwpKPsBtVoAlg/42tD5DFODGBRkTu4vJ X-Received: by 2002:a17:902:7d09:: with SMTP id z9-v6mr18630715pll.233.1528726021717; Mon, 11 Jun 2018 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528726021; cv=none; d=google.com; s=arc-20160816; b=evQSZRaE2lacG7YXYskOUPfDRD6WIp+k8aNZ+vnDtMNiBzGjaFmhJ6claNVG8AC55k GH8sATDHA5g/JUl2lRyZ6ZHmwS3RumHc7AVpzco2VcIQB42uoRRzS9ri8AoA7bQxvnBz dTR3mM9vHciYfjcDG/xE3A9IUOcRO9/2djlS9pLd/2uPKj8vFEF9WRyvqZKH0oLsq2UC GoJRrzQOHKFbtbUm9b6/zupqIIpezekebt9kqc5h2qud1A0jaABWgDVDWR1aSH9U2wjV ZDcjf0OaeuXEs2UbiIMrtKb3f1YG96l4ErhlAiDMKGurU995hh6bh2WChXypJSJcdFjE JOjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=cp1noagiBNyq9HAsILQXj5VlZgjwOoF7k27YeP6vh0Y=; b=jHAJQl+zvNl74XGE2waIcYeeNTma+709RAR6/1obPFjc7ej6oL+Du1D1uGDGjL1Ptf 1kN5UDxSa4sWcBZbPkMJ3dg4OzZVW6YlSp3+kaY1s3a6Sd7d411NHTP5w4qlcqsvkJtO RUNbBeUWXX85t6Uf9baCdHgh+l0NEayjdkLy9PY5eC1vUKsmBhztKKZq6PgD9+lcAJCk /H/+ekMQU7C+dHz3pTXAFEp9wdEYyS2YQEiEiixEbyFbvqnYFUwobH1O8zrBg1lWWIjA PoE32gIAtiN9IfBIKTPMSv/yA9S4mjPguxjOqiw86BZanVOQw0LSfIFMEln6XUgtAsgk zGVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=SxnE1mBa; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id o33-v6si65176771pld.170.2018.06.11.07.07.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=SxnE1mBa; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cp1noagiBNyq9HAsILQXj5VlZgjwOoF7k27YeP6vh0Y=; b=SxnE1mBapiL1y28hZwNeGhwJ/ 09GiEhWbiib7/g4Cf75aq6Mmb1CR7cHxMapWj7kfybfOHAnN4e8Z/pRh0APfHIQ8UORSfvNeE4yAT OgRbmoYJ5MsXrO7CXw1orPGIwM61vo6P8lAv+KtPFjAZF4KsMOU0C6rHaXJG7/QUHP67Xst6/T1j3 kKeGvrj03NUAd30r20e6DEpV3rYn/8f6mNT07W8BPtRbJFcJjBA2wsF31eiThUGDptumCq90fytF8 99wUYAh4T4zj5KSBLms74ym6yGsbRfaL2G7ODSleL9hApFG3JeXlnoD35k2xeeOQ45RfrFk3M1t2Y zPgRHySzA==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSNTI-0004pL-7n; Mon, 11 Jun 2018 14:07:00 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v13 44/72] mm: Convert is_page_cache_freeable to XArray Date: Mon, 11 Jun 2018 07:06:11 -0700 Message-Id: <20180611140639.17215-45-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180611140639.17215-1-willy@infradead.org> References: <20180611140639.17215-1-willy@infradead.org> 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox This is just a variable rename and comment change. Signed-off-by: Matthew Wilcox --- mm/vmscan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 0448b1b366d9..575747728ee6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -572,12 +572,12 @@ static inline int is_page_cache_freeable(struct page *page) { /* * A freeable page cache page is referenced only by the caller - * that isolated the page, the page cache radix tree and - * optional buffer heads at page->private. + * that isolated the page, the page cache and optional buffer + * heads at page->private. */ - int radix_pins = PageTransHuge(page) && PageSwapCache(page) ? + int page_cache_pins = PageTransHuge(page) && PageSwapCache(page) ? HPAGE_PMD_NR : 1; - return page_count(page) - page_has_private(page) == 1 + radix_pins; + return page_count(page) - page_has_private(page) == 1 + page_cache_pins; } static int may_write_to_inode(struct inode *inode, struct scan_control *sc)