From patchwork Sun Jun 17 02:00:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468251 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 0E11F600CC for ; Sun, 17 Jun 2018 02:02:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F283928C08 for ; Sun, 17 Jun 2018 02:02:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6D0128C14; Sun, 17 Jun 2018 02:02:36 +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 7AB4D28C08 for ; Sun, 17 Jun 2018 02:02:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4638F6B027D; Sat, 16 Jun 2018 22:01:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 416E56B0279; Sat, 16 Jun 2018 22:01:10 -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 0E6606B027E; Sat, 16 Jun 2018 22:01:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id A2B246B0278 for ; Sat, 16 Jun 2018 22:01:09 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id e39-v6so7702852plb.10 for ; Sat, 16 Jun 2018 19:01:09 -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=QGWajXY6YcCVi/fqymIb3c788sAMALnbzKJrf6tBoCc=; b=DINAIcbBqdNxuHGiNSrFzbXFaputuwxkvoBF5gWXb5kDrk3BhbFm2aP/WlQjC3yMq+ LYOixC7Jy8m1QXV87x8cIkwhlqOKDtx/JD+EEoG+HwyVwpS8YNnBU2t7IQ+Z1+dci0jg 5blCs6PmojydBRDPzL1IpPJyQke8MZNnGec9V/t/iygkDMN4nO6kDbCYv38DhFa6JeSI bQ1zXItpKRbeqOQOJRn8mE9NLd09moqVdHOMR1byMBf4B3lPfUgmQbAhIPceHQKjjO8z LqZ92cvyeC7J1kWWJUq2+lR/JCCv8UiIB6NJ+K6BEx3y9gHraoVOCsa4pTHnBStpbodK dVeQ== X-Gm-Message-State: APt69E18PYzWzfSpycGKBYi/gUIQVjOLEHv4tVuVW/EHqpyxcZkJxlH3 OXqG+X6AJTSfbntRtuB92rYrOZMYu2hRKE6MGAn8TgrGPFqWLr6eLvk9i6XR/xRvZ+cZRiI+b1t VOPJU9OxLLWbWJxmKLkp5GXJ++N+INmVSlxOCEVyh2FgVAbwFKW84ge9fRhWONjhOTg== X-Received: by 2002:a65:4042:: with SMTP id h2-v6mr6461678pgp.78.1529200869339; Sat, 16 Jun 2018 19:01:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLk2W39aH0Fv2ry/U0vsAsvbY16eVNdLNz/eCLQS8OhORRmrpfzlFs+gBXs3MKcNHu6PHCq X-Received: by 2002:a65:4042:: with SMTP id h2-v6mr6461646pgp.78.1529200868568; Sat, 16 Jun 2018 19:01:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200868; cv=none; d=google.com; s=arc-20160816; b=FtlQBkxSXM6n9L0BY6TKMIfQgidWdLEPjanZTOSED+gcktCVAKI5FBMqMetQY4yUUO XeENbxVsX1p2bbmUsZlf0mezuCbgsK+MLeLJtZTcGMdttVHT6LK675/g2TV1QSlnfF2C 2B6vLASU2WpI7CFf8gT1jh29HKMqZJdl+YduOoXtGXgDli5i4SDnJi5lIXKjVMfoG3Cb sveQfTttloSJsPepI2QZah+ZpwMAqAKVsTYbTjVqWv5oNbwbJLh4gTpFiJSORZ7sMUjC x901Im4E1jP9jFpRyFT3XPFitisbBEaiSZ++LM/AKjmbMhWF7XZc34Txvu3DFSSu140S SmUA== 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=QGWajXY6YcCVi/fqymIb3c788sAMALnbzKJrf6tBoCc=; b=wSsPMeGZTdWKWkKBqSD7id3Tk5rQydkHSH0F2AS6I6QgUJABduw/K7DD+gMvYjXss/ clw0NH4tVybuMeeqAXtGB7m8HoMjA1X0n2PbwOw9eqVfGzaAH6OCPlCz9lC545I21nmf yTy4AB11+o/aVZh5jZxnUVzPSuLVhw+8qSbGYvHfNXkUXEc+0/n8ohDTVUIXkgE2Mq56 NlvbsEwdnFkokgwZ8z2gx/DzfeZGwrFPPyI9i31k/zDXNNCIG8V+n9vUVXKxQxWOoReH 6d+/mNEksryIHL8alhkfehCz9HARzrCY+k5Ci+p2xWDohmxxYyi2ZenlaAdZUY9LL/OD r7DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="SgMqnn/8"; 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 t80-v6si11267252pfe.59.2018.06.16.19.01.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:08 -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="SgMqnn/8"; 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=QGWajXY6YcCVi/fqymIb3c788sAMALnbzKJrf6tBoCc=; b=SgMqnn/8xfz2IiRU7lHnx/TBQ aMfcp0dcLWY+F41KJ9xNXcl1kVHMcfojiyv+6mfWW+nsqMK1cJmfmtywd8rZN6kbXZqOzrTNRgLbn IKdpY99/3Bcwf4wIluHRrERHG/bvPiBcKAH6QinISQUF0FAM0DMybtSx4WvKotbChxSzbiNfq3PTi VFgg4eUMGRdQs3NjKJnoStI5jRB7D3/nrEFx8tFWIwZhyMd2IOTFvjN2UJhGb1b2x0NFwNeGCntMx PeAAkzImw2KNN5zdCmvdMwwSGXv6dibwUL/4qjfWLtHB35ute1Z8LY3HSnUF59S/c3g54vG3B++7W DGGYIMFFA==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN07-0001N4-BU; Sun, 17 Jun 2018 02:01:07 +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 v14 45/74] mm: Convert is_page_cache_freeable to XArray Date: Sat, 16 Jun 2018 19:00:23 -0700 Message-Id: <20180617020052.4759-46-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-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 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)