From patchwork Wed May 30 09:58:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438125 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 1DBD0603D7 for ; Wed, 30 May 2018 09:58:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E81E27E63 for ; Wed, 30 May 2018 09:58:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 034B0281D2; Wed, 30 May 2018 09:58:30 +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=unavailable 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 9252F2818E for ; Wed, 30 May 2018 09:58:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2D576B0010; Wed, 30 May 2018 05:58:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CDBBA6B0266; Wed, 30 May 2018 05:58:27 -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 BCCA46B0269; Wed, 30 May 2018 05:58:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id 7785B6B0010 for ; Wed, 30 May 2018 05:58:27 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id 69-v6so2705769pgg.0 for ; Wed, 30 May 2018 02:58:27 -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=bjKQCnR8RlyGpXaD8PlDQ7umxkLe+wg7x4CjR1Wk914=; b=r2I9qzAccWK8qoAkQGGUfPJCUf2TCtqMibeQBb089Ejcjsqg1rDt/FVjVrR2k1DhaJ WA2FVa0L9yROSCLLlIhfPodNKafMWQS8eCXXr6fya3BXDXh1jz1FkAJg8W/4vcqHXetF e4Ub5RRaUzPL1fcLB2DWO/bpm5lZfZVHl49WptWLrh+J6+WfGIidJgst1GQ1kWGQZWIF ZCLAjHQtA66rrvUmOixixuVMd+SSfEnFJHldR9QmJoD4vufq3FyvTXejiTpOb3gJpBOS OksK26mierQrHKismOxl3I24Rxlq+Sr0BoOia9r6MgP5hHj5hfEKTOyjjsf2rSmRffP2 W31A== X-Gm-Message-State: ALKqPweoiYgmtU6WU6aUuS6XlFdFERvD7q0BZyf9U2FokiuQEeX3Q48t ++5WfsSiCzWuZ2bZMK7d8IBHeGIg3pW7lekc8U7pqxR5FCyH+COfMijuCpPQERnixsmeHWi0NNu DaggoCTpQcsXg2UFVoX+WMyQBPJTzQfuQ/NDGS3fgVstuIR/FLNDEi9l698rZNNY= X-Received: by 2002:a65:49cb:: with SMTP id t11-v6mr1678615pgs.218.1527674307176; Wed, 30 May 2018 02:58:27 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKwIwCPLPc2yReZ3VSBroN7tTzwi8rwllfbBTKDYh4PNelgCtZfZ+EJENH73gh6wIztM3db X-Received: by 2002:a65:49cb:: with SMTP id t11-v6mr1678581pgs.218.1527674306400; Wed, 30 May 2018 02:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674306; cv=none; d=google.com; s=arc-20160816; b=C7RhTGYA69LCWEYpFplCpY6BcjBN27EpbG+84wBlvNXg7J6tUq3OHQJ83WGwJEbvdU M9qeQqLvmI1qbZ7Jum7dR4yQcCcWVbUjRgPGeuIBQq0WhEwsxuY8VtXA13HuY1inyddn Tr3Sho+K73Ml1Pa1H5CyBXwblsBAkpnvwkQhgdj91r1RAJia3ozdSsQUcMKatTxxGH8K hRUDOn0seBwutMcAQxZymEoiKEiifVitzft7ugKB0c7z8fwDpG8d4wlEp5KMq68oKBDt IhgUGJ53PTr47F9JshM/n/1TT+r4EmIFXjhEc0izYL9JCWbiA+N4RPLBy9Am8p+KGPpR Xs6A== 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=bjKQCnR8RlyGpXaD8PlDQ7umxkLe+wg7x4CjR1Wk914=; b=uiPlX61+FYooM9xP9jGr5x/e037QVKWmn4dy7d3NAHHRp1XnpfL1hOwv4btxrpLOhf XCpVluZiOW/KWwL/BAUbZUMkIBzYdjo2K2mrSsMT/hWrfMSbDubDibnX6dpJh7FeMFJJ gXcenE5f4Fjmz/MHSfOzUgr82y5pNNpp5p4M36xESmJjrWoVH1wiIipHR3jK+c0WKJIp qs9dDd8/SefZkgX+4brzhDIfq/bFcyXFZh9rRGx1i4BfUrKrCAIiDqj+uFBeTKx4JmPQ 9pfUqLhwwacHK0BjzfGTNcTag8fU4YwCS6NDR3IoFByMOKJNUIvWGDChgWk65DzuajG/ qsqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=i1x2KGwm; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id h10-v6si36838148plr.156.2018.05.30.02.58.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 02:58:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.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=i1x2KGwm; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.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=bjKQCnR8RlyGpXaD8PlDQ7umxkLe+wg7x4CjR1Wk914=; b=i1x2KGwmRb2DlM80+uywi68pc lrRBTK6D5/CV/cu/iZg8hhlGS82qhHKp+52g0jG9StK8V93r2p4UjzNR9XCNXmz0Oyz2CoSCuCN4+ BN11zQOmbGjNQI9S54ALB3f5+eikp+VwGK3zVmEUmbN7wqCKw3/aVACN5DhksJHEcfVjbDdW0JREZ bugZXv2qJ/8c8kfMqj551QxVCxlX6vtNPES4sgbuTIi3l3oFJENPEJLrwgzYxBIiKMtynJNPXzm9H GDh65WwjA8oz5piC9+IjwCD8+bKgRMv85bblQ5BmBRto4EqIPjoRW5urY1rnqMzuZFcCdrvu6kfwD 98wtBeMYg==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNxs8-0006R9-CR; Wed, 30 May 2018 09:58:24 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 02/13] mm: give the 'ret' variable a better name __do_page_cache_readahead Date: Wed, 30 May 2018 11:58:02 +0200 Message-Id: <20180530095813.31245-3-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530095813.31245-1-hch@lst.de> References: <20180530095813.31245-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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 It counts the number of pages acted on, so name it nr_pages to make that obvious. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- mm/readahead.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 539bbb6c1fad..16d0cb1e2616 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -156,7 +156,7 @@ int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, unsigned long end_index; /* The last page we want to read */ LIST_HEAD(page_pool); int page_idx; - int ret = 0; + int nr_pages = 0; loff_t isize = i_size_read(inode); gfp_t gfp_mask = readahead_gfp_mask(mapping); @@ -187,7 +187,7 @@ int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, list_add(&page->lru, &page_pool); if (page_idx == nr_to_read - lookahead_size) SetPageReadahead(page); - ret++; + nr_pages++; } /* @@ -195,11 +195,11 @@ int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, * uptodate then the caller will launch readpage again, and * will then handle the error. */ - if (ret) - read_pages(mapping, filp, &page_pool, ret, gfp_mask); + if (nr_pages) + read_pages(mapping, filp, &page_pool, nr_pages, gfp_mask); BUG_ON(!list_empty(&page_pool)); out: - return ret; + return nr_pages; } /*