From patchwork Fri May 18 16:48: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: 10411225 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 E100560353 for ; Fri, 18 May 2018 16:48:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D09BC28619 for ; Fri, 18 May 2018 16:48:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C53BF288BD; Fri, 18 May 2018 16:48:56 +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 5A40028894 for ; Fri, 18 May 2018 16:48:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9CC6E6B0603; Fri, 18 May 2018 12:48:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8DD6E6B0604; Fri, 18 May 2018 12:48:52 -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 7ADC76B0605; Fri, 18 May 2018 12:48:52 -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 268C36B0603 for ; Fri, 18 May 2018 12:48:52 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id e16-v6so5050762pfn.5 for ; Fri, 18 May 2018 09:48:52 -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=L9/G2tE2FwGpDgflf+PMdg47tDIJOlNLMZ3en5hzr+AUmwJrkREsRpyN+A9/0ZxjL0 1B/aYyIIoRozIlshrZ+QYJru0bsb5D1xRI7/fdn8F2ZeMiEiXNkWg0d6Q1zmI+vicAda Cjvp75xM2NZVF43+oP5IFbHtpiG2VFDdUy63OVoFzAlefhO+8O3BHCriQN/nOqhdud5U rFpicgX+XMB0jatdkLrRfi0LUci78Z5GQWskpKWXn3uNZNJJqROzfHibS3EAmklcfeW4 kPMDIPthQ9ZUKi+UF3ilqRh3yBIPE8SJ69c7aG4IOPzBlrgQYfe443sFRhS9uWU2f3P9 LtMQ== X-Gm-Message-State: ALKqPwf0ygCIBIigdDNJQhQFQXc1pxfnpuagXVPKNFWNbEMjYFgZv+Se IDcGZ966b0U40ZnQzilsiGQWzJAlVBlYDA/dvXd6A7YJ+B63+R+a+xNW4k42wIfE1E9/CFpYFgz aLxD3dgCT5rnXUxHU2GnFlBUc84MJlxwz+BeoYtgqPgdq8dWZpyNRvfm8+9cnpuo= X-Received: by 2002:a63:5f10:: with SMTP id t16-v6mr3424913pgb.52.1526662131823; Fri, 18 May 2018 09:48:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp6+UkjhpsUNPR5D7ojojixv3S3tqL+FAXIsdQv8k7bKXjxRUFwHlLmtWySIPdRuWOZ9HuJ X-Received: by 2002:a63:5f10:: with SMTP id t16-v6mr3424888pgb.52.1526662131190; Fri, 18 May 2018 09:48:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662131; cv=none; d=google.com; s=arc-20160816; b=KDOO16S4vhLwj89vgY+VP4bcWv83xMEw+QPGBaNtqdNmEwkN6h2zF7gKSdMDl81y4q atxQ61/Fmvvx1eMRYZNGDdCsVFwIRs2ahAGIIa43dPyQWM9YwBvM7JbdHkP6+TUclqxv 3vqcXXM1B2+WNYylq/d8h/GJlvFStQd/+TbyuBuHITiH4RYY26uQ1maLTE2BK3j+8od7 nlpMI95Ksfh7kALb5xAJdRBdFKRbMrr9p5EOe047ecPy2BtV4VITaXyE/yLZIROaYwDl 5euYk4KKI0uFF/wDpvEWYik5nKtO6FQ0FkQVFu5o2SJDF8g5Oo6jy7xQK1+R2Z/Sbf4f BWnw== 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=qA1y7ogKblHoFFXMVVrJTT7UsgJZ3Km+6hiIsQjAQ8/xe+q1KWoq1hofZUiKiBOuQS XCg+nudREWdE8VsIADSX73FReGHd6Md8qIU5JSM2FV0qUoD4X01oB98uHfw4nbfR0VD4 jWK6fGv8B17xot7Hz8bo1K59VBJUhtg+xTsB01Z331xj/RWkDS59618LBub73EvGrRal mHbfY3C/pIPCkL9J6tvT2sXpwG5dKgSXNaou4aX4KyCxXb+4cXe9GsMZXoJUb18gB/nF Hh3nqGELLygWKKnVJHNkhspPgo7BOkq0ojIRQsqqOxqCVuphcq8it+UEQA1RgM12suaE 3yYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=uLl/vJgn; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 x1-v6si7596894pfm.32.2018.05.18.09.48.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:48:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=uLl/vJgn; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=uLl/vJgn8SFlK72PAvNQIQ9zb eRgiXZMDtqWlTHRhd7RD3Nm+SxPPN0OWvZtGza2y4UWE7Z+Q7KpKKsV4a/Ajq6FWs7vuH5xUezXyA znb/2P6z9nsBl/Lb+M7ugp8OuTIyJQU8z+aEhFXTiknM85WgcvXyE2A69LQzs26g1ucsvMnvqRfUg n+wu8lTWiZFV80BFkTchIPiSMwQ1ModaidK3V3NrtoljtDzu3I1h3rTV/5LG+qdmJn2s7csWhNq19 Tr1wGJ1/Rn8BcVOuxdeeVjq+CQmqr3uo7uJNA8vY8XU5GGXPkITdZWLuEkXEtJ9hbqA7MhV4WLfaA 9XoGJi3Lg==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiYk-0006U8-5J; Fri, 18 May 2018 16:48:50 +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/34] mm: give the 'ret' variable a better name __do_page_cache_readahead Date: Fri, 18 May 2018 18:48:02 +0200 Message-Id: <20180518164830.1552-7-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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; } /*