From patchwork Wed May 9 07:48:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10388329 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 88D7660170 for ; Wed, 9 May 2018 07:49:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C18F28E08 for ; Wed, 9 May 2018 07:49:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70BCA28E65; Wed, 9 May 2018 07:49:01 +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 1582328E08 for ; Wed, 9 May 2018 07:49:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 806806B0341; Wed, 9 May 2018 03:48:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 78AA16B0344; Wed, 9 May 2018 03:48:59 -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 605F26B0345; Wed, 9 May 2018 03:48:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id 17F7F6B0341 for ; Wed, 9 May 2018 03:48:59 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id c187so1215385pfa.20 for ; Wed, 09 May 2018 00:48:59 -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=MhAne0QN+/n2VUO7Ck9VeP0+PMdeaMT7fLapL6WJ7A2NkZhwUTTNQhRZ4B7OXJsvEl bcjeT03woArSe04u/iXUBUajN6tLijfPMOzbVQlWyTkVzuQjYLibM3KBsEo/fS4XuHZv hVCCI5gV5/bhBwhg2E+T4HOt8emAKdmF8Wi4XGggNKO7scAOMzpjHICozHnBPuT9bZ71 l321NPecPrXdOyr2jRZ911UxwlGtvO++Hqhi7F1Q7+ghT4DYEebOkYYa890pIbQ33IYD PEYxvcO6kbc2YeiiZ/tGAU75eyhQwTE77KgYTUstJBX55H7Ct1P9xYsLHP5pE/jSOWIP GiqQ== X-Gm-Message-State: ALQs6tDUQWC1RKQ0uCqTbJGp8Nre6JsYEsXkTiVsNEdATbE5XrYmZduh ox+cNzvoPae75i35LpaFGOUhwCPGtGvYxf8Jx8xLHJH4LIq7lTOhokcJTnhCoA2qPLIOS4tmqn3 uhgsYySAc3UXIGFyI9Mf+uNNdrH5tMgbEefept9V18ufh/nUkVgcsR4uQk2iyRT4= X-Received: by 2002:a63:981a:: with SMTP id q26-v6mr36228753pgd.40.1525852138709; Wed, 09 May 2018 00:48:58 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpxc75gtnWyMFbWz9kf5PfIUErz6BgF+RuftM81lAlWSGXobeJuBNEvmMaC1eIh37AB2QSP X-Received: by 2002:a63:981a:: with SMTP id q26-v6mr36228723pgd.40.1525852137942; Wed, 09 May 2018 00:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525852137; cv=none; d=google.com; s=arc-20160816; b=0PdVEkZ5X/+arbUBODUZjv84Sl+xY8vREb7DNBje9BE08bevcpsU/FMvyRIsI/sevI wEdl1t6PQ9rOpaYlNfzF7iEeMeAo/KDpe6iN90WvUzNdXi1P0U2vH4AcV5l3D9DIhy36 Rb4v7FCmJksL4m7OIwKdG3QCIA80ry4pc+M8cIvE61K9k5bxWhrDttjMXANrTJlddauW wek3n1pnTvg24u4gEQsheueU7kpvXqSZ1Ff4txV+BwyHiSivQHW7txIpAfTnfzbRzoka lAOdozWSpout9NEEav2fLbTQRQLtLesYAn2Hc8RH6Ncmz2LML8ou2Qn03hwczx2a6LMz 1A/Q== 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=0I6PZ3I63fupKxZQx/jEl63+IMSsK14x8txTeyQc3pFopIDmGYOExVlrRly9XPvqAc MRGjOHH/WSupE7stuQDUmIPGXF2c2un86ae4yjTKWQ3XBnssdkj8KOy/3HAb9HrLWQnM SY/jgXbfQ8B2cibEHDKmj5zlMRi/lrdwMFxxlvyr9K+obi8fnNxGCcMYWGWpl/prPH25 HBZK58mCG0tMaaj25B4Y8kCO92uLBrUKWsyTRBRyYUgGd8tT1PkEazbuKj3iMQ9tQQKL W7ZSvyAAheaQsxkCBNVHLway0i03RWT44mrNuyUUaC3ApnFv8TwV8t6zb1Zc5Zej3vFT Y80w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=P1AxdoLS; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+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 a25-v6si21273030pgf.501.2018.05.09.00.48.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 00:48:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+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=P1AxdoLS; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+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=P1AxdoLSi8g8KSmcPcn8dfMe3 Y4QZkUsXKQzJz63D9In2ypiRoeAiUX4b8Je/Xi4NeaMrfQFhA7PsYxSk2nSWuuH296ALQ4U4iNYVt V7W7Wfwr/07jjNk3Ytp2IGZ8GKOEN/CjS8GNFHo9ksW8+Frwq4+nxsGjsecrP6FVWWRAaHbuQpXFv gSSvyf1XljFvjLG+n+V8elRzmDTM9RnVFfNjQkYKu25dnPSbH4JsY08IO7p1FtXm1aIih3J8cb1iI bjFyl/EuCwweYl5scICcBCwAT5JOQ05M82F7XRDZBHgcYGFa9u1ZVC9ROvobVP82R/WEsEwceAzAR 18FGLFZQw==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGJqK-0001MM-Sb; Wed, 09 May 2018 07:48:57 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 06/33] mm: give the 'ret' variable a better name __do_page_cache_readahead Date: Wed, 9 May 2018 09:48:03 +0200 Message-Id: <20180509074830.16196-7-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509074830.16196-1-hch@lst.de> References: <20180509074830.16196-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 --- 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; } /*