From patchwork Wed May 23 14:43:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421491 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 DAF7260327 for ; Wed, 23 May 2018 14:44:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB7DB26E82 for ; Wed, 23 May 2018 14:44:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF4CE287B4; Wed, 23 May 2018 14:44:29 +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 6A01A26E82 for ; Wed, 23 May 2018 14:44:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 341936B0269; Wed, 23 May 2018 10:44:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2F2746B026A; Wed, 23 May 2018 10:44:23 -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 0D0BD6B026B; Wed, 23 May 2018 10:44:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f71.google.com (mail-pg0-f71.google.com [74.125.83.71]) by kanga.kvack.org (Postfix) with ESMTP id BB9F86B0269 for ; Wed, 23 May 2018 10:44:22 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id h15-v6so2448536pgv.7 for ; Wed, 23 May 2018 07:44:22 -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=g1n0/9KJXTuR+sfITxrTPHb80sgaJKMkE1u43GBKbpc=; b=Gmy8liSnqm6q0YyTAPWSFcB+NRA0J/XJV9dq5ehS09dJKkpL0fonKIZmREURoZFj/n qI2FKRqWOOX8IS5EJ+WkYjAvZCPmKsanhsSE/UK09r095kukgYRbR4sC/uhUVUr4w7MI soMl4kI4+DRc/ZjhmDq37djEzsdhh0Poet0iwqve/4BfFi0wqo/uTa1fB9cOPLnqdcUQ SLAQNiT6PP2b48dqh7aYxRZCDLHWts0Ao2xkF39KLzMzS9pGFJzDDojPaO4HMBjsIACu Et8u+X2dKz4FI3sM1BUt0XTzke8bIqOBM5M7vqWNwBBjv7msW1ihvlM7nCZKKcE+DANO JAtg== X-Gm-Message-State: ALKqPwcQdLUATJDflLD70i83c90Y+UHo5jDcZnS0Af5Px32qQjk2hnN2 OugCZ74ucflkQsiBk8y7sHu6//Jpepkyy5RN2A9KF+1IVAT3HXUWpc+jmOk+R1RvoDILAxdMmT2 iFjiTm6TZXZ03EOD5AZ5hStkpmUuzT6xSpUu0U5eryufsP5zQQWGXO+zvDMwVUuA= X-Received: by 2002:a63:7f51:: with SMTP id p17-v6mr2604871pgn.36.1527086662443; Wed, 23 May 2018 07:44:22 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoxYggZmo2dJbHBV0X2wixOLqBIiUKmFyZ/scjEu/9krBH5gSY6Ly35bco+obo/5RJDW1z7 X-Received: by 2002:a63:7f51:: with SMTP id p17-v6mr2604844pgn.36.1527086661691; Wed, 23 May 2018 07:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086661; cv=none; d=google.com; s=arc-20160816; b=hyS/5x8UsSgc9YoJV8CJ687JS0PrIYy7oUvKC1gdclaQaqJuuYrNur65mNYpthoMae GaLDPbCFkUXdD7voj/FHTGQPu+EWi/gbXDu5pK8gyk7AlPenxnweXEH92vrlipWyHJ4X tm2Xj4Yl1AD1zyLwfybqbf/tmBIBboY5ttzUF2i0bZZzRnWwCrkxM3zdtx1+IZtCj1IX xwnD1S8QwozPrkN8Fwef39jwryvFrKJU4+dTgjeiZgA5+gTBVmqsdiD3fyjJJpR3vqCU ORkGsfxuAocdO8y5s6xivrTyt5ohiJhGlHFiSy5LZKRwkrASEjUNUXzqBCBO/HyWfeng aSzQ== 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=g1n0/9KJXTuR+sfITxrTPHb80sgaJKMkE1u43GBKbpc=; b=kkKKxQYVJc+rwIPq/CuP2JYYPC/ApEpizgrSXikPVyibyXI8FD1t19O/I7w7OytkzU z7PiYE/Ep8UaKD7+4EB5K5gzWs4LLXiAMUpqX6zjH2ZBR5XT4Fj6hGq7xyNr6K8jnKWh tgfsi/sNuYV1YwfZ5dqrbdvMJ8sGitQPN2y/TMyyxhM7zrDVmHNcEQCwhrW2p54w9jGN +MErktxxnlfE+QpitCagIxc9+9+wP7gw380Z/xWO/zyFWOgdyuLvH0xy2Du6xfGGUTtY mNJ1z+OSvVNmNXovTf/cfxGOwZEu1SnTjw6y4HP1u+tnPxmWFYTXddA8C0vuPuhevSrI lhtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=ROvrCLuh; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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 l33-v6si18387183pld.440.2018.05.23.07.44.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:44:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+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=ROvrCLuh; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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=g1n0/9KJXTuR+sfITxrTPHb80sgaJKMkE1u43GBKbpc=; b=ROvrCLuh9CBx9Y2b9N8X+WC+P xHFSgTDMiq1EjDpts2I2ZBjzS5wO4QV1nBMWjquiJvD575J69TUXdda1n9edXjCe844prmeGhbj/t HNNOd3JuPZbTtpEJ8PKgHHVufWekG7YSq7aOlS3KRdMpHfo+R+j6aV7zVoxeJm8K98caaK5oUACEJ TQMsF1+nSU/XriyTlXtDbXwHQbOJZS3Eqpsfp8ZsFM8YoGeODtVJpLLsBculQg8rJew+EAskXp/HZ bsIIHhQTajad/VH/tddb4LhkFLjCEkGOy5NZnV6WGwP8s9nP0kCy/TwqZhIreZcN+NiPyi/RKZ/8K 22NfZoPXQ==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLUzz-0000Gd-Nk; Wed, 23 May 2018 14:44:20 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 06/34] mm: give the 'ret' variable a better name __do_page_cache_readahead Date: Wed, 23 May 2018 16:43:29 +0200 Message-Id: <20180523144357.18985-7-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-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 --- 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; } /*