From patchwork Thu May 31 18:06: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: 10441649 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 34BF7602BC for ; Thu, 31 May 2018 18:06:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 228D828F25 for ; Thu, 31 May 2018 18:06:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 174BA28F92; Thu, 31 May 2018 18:06:33 +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 BAB2328F25 for ; Thu, 31 May 2018 18:06:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31AFF6B000A; Thu, 31 May 2018 14:06:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2C8766B000C; Thu, 31 May 2018 14:06:31 -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 16A7D6B000D; Thu, 31 May 2018 14:06:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id C4F8F6B000A for ; Thu, 31 May 2018 14:06:30 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id u7-v6so13776971plq.3 for ; Thu, 31 May 2018 11:06:30 -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=JLibWkCP6sD4X/kV5a/731Azv+JDN3ER7xuHS3axAbA=; b=a81SCg2iqUxu4B5G/rP761vh3SobPB0odzdu0rJr4tZ/PAPVRguu0+em7UidbVZdIU jnykDSd3N9W3raWwcJ83duLE6zKPa3fIUQb2V4fCTL1RTBDpp6z/JZLl1WY7thI1niV6 NBFE6AV00OCRkMpnfcFoL7FmfKvrE8ISF4ufgmH4aQ8SJBPwtri2rUxIDA/ZomWwRn80 9WM89E0OW4qn+dPXfiMRbN5u+1+cZsxuLWgicqoqlR6B55OWSXM/g+dZSxdBUt3uuK2c OJbvGCf41Jl/AziZxBgFcnPjDGk0Mh+qdm3OzQKCAI83xZjY0xfZGNqWo80UR1ytYniK 7Lnw== X-Gm-Message-State: ALKqPwffvfM/abbXnlzIElyZx02VAgR/tdoND83VH+MCUxarfBmIFUHf ChT3Iy/40X4a3QSfqlEQN2AIa6Sa34auqly7r10MSmPJxdkIHQkuTrC9l075q1y1ja5kfGlIBsv EWQZ5eAimeT5Ejb309vMu/9EzWaqso9BhsDy/gtw0L8Nx0DAP4I4DLzoQ1AqbLGQ= X-Received: by 2002:a63:7405:: with SMTP id p5-v6mr6219213pgc.289.1527789990492; Thu, 31 May 2018 11:06:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLfUuQrnwlWuMuW74kiQBAsx6CPZdaxcbkAyzeFgoWOaEIy4dsMXkR8oAtmFr8U5Ata8jry X-Received: by 2002:a63:7405:: with SMTP id p5-v6mr6219172pgc.289.1527789989351; Thu, 31 May 2018 11:06:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527789989; cv=none; d=google.com; s=arc-20160816; b=JMI02KFeCUdG4w21YYfJnZ/ERKH30MFQ6/Num9vXCcQ2FpKbxucAZb2H9WIGQeS3/L LIo8b9SCem26LxR9i3fXh1D2IQMXpxp2wJaYsHtorEb9VSixHq+mUkRRIMQJKCPURyU6 ZVjqzuGb7UvubbNUSUSHujGyRC4B3mm2+7BaoX7wrU9qXbKkAJi8RjRJ7lcxv8pZ3leW wTccUpvSO63jt8UjniKjCq9yis8RDRqZY/E9xZnsY37wLEJElPwHu83jOPTSdwh1yfFT OXGMFjRrmfhVaELkYvOJIYdLd/lvRIzbiZ53Hzpb13KjdKn7Dwzadxx+SRB/jAKdbO2H j6qw== 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=JLibWkCP6sD4X/kV5a/731Azv+JDN3ER7xuHS3axAbA=; b=EZsAkwUDdrOtwM6c2HbzcYiPw+3Ww91L4QbZC8E1vf2EFGyjVs8dCcQ/OsbwD+oDWk N/TloE8ua8Bx7jGFAg2SFq5nUymPxCB1jYSdNHgiZmjVlT7b+wdchg+Ah0n3lZaVptha R1885055IuNa10qbIXweUE96QivuHVRsfN7evAVEi23j669f0Fz8aHXFSIf2hB06dqrA 7Dn2OaqqTYVcFHb7j5MuWcH1IocWZmah3lUIyPYuZK+CX+jIwo3rUBmDdO0k2ZP3NReJ 1IOEv+S6YgDQxllwlSCbtPXxqvWidjDqRyUiXnwnoSKVCfEnkqZUbpqCHrmyn9DT1VrO b30g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=YQCFE/Sg; spf=pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+67dfbb8f664e29ec4bbc+5394+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 o87-v6si13283928pfi.295.2018.05.31.11.06.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 11:06:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+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=YQCFE/Sg; spf=pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+67dfbb8f664e29ec4bbc+5394+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=JLibWkCP6sD4X/kV5a/731Azv+JDN3ER7xuHS3axAbA=; b=YQCFE/SgvaCLSs+VeRQA0rRI7 0KVjqeUzfIOn40tU9TkmlZftSOYlHtgdGVQxPu+EBIv8SYl1W3WmKIDTvu1dICGRcCfE8IbrJNuJ8 kvU4Dx0EPc+72Nw5Y0ZMRmh/xfswvnMUbu2UuthXVgade09eSjtawcsL+h/WNTBAISD/UjwrPxkDy Vu+6l1U+P+5E6PwcCMVcsza5i04JyrE+Aork8MNZXhRE5NNzIaQzOkWYOi8Av0xnjDV63GXaPwST6 6F/xsMUhx1nENjCahJJWx56geCwMcqf4usJrRM0Dple3RnQZJVQr0X0awIQWCJtuTB6dvHSbF+ovh fvZDva1Mw==; 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 1fORxv-0003BU-QX; Thu, 31 May 2018 18:06: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: Thu, 31 May 2018 20:06:03 +0200 Message-Id: <20180531180614.21506-3-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180531180614.21506-1-hch@lst.de> References: <20180531180614.21506-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: Dave Chinner 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; } /*