From patchwork Thu May 31 18:06:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10441655 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 E021B602BC for ; Thu, 31 May 2018 18:06:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD72128F25 for ; Thu, 31 May 2018 18:06:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C267128F92; Thu, 31 May 2018 18:06:37 +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 6712728F25 for ; Thu, 31 May 2018 18:06:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B8116B000D; Thu, 31 May 2018 14:06:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1699B6B000E; Thu, 31 May 2018 14:06:36 -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 EFE3C6B0010; Thu, 31 May 2018 14:06:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id ACC6B6B000D for ; Thu, 31 May 2018 14:06:35 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id z5-v6so13048065pfz.6 for ; Thu, 31 May 2018 11:06:35 -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=xVCPZL6Pk3QshLLRgPust+ON4xkY6wGv0bY4SECH0ls=; b=meSG9Is66P/1+GPOjcS82Adnob1LHflTgEtAEzJr1pUFKiaq5+blVDXpgEQLC32lO/ Ll8Y1m9ZwaIsKqnNEQYO7CYHaVz0tN51txCGHJbThjqLMfeTr0MmBvOxWIRBbThuxbCB ihJgyFgiXRRhmHIL5bnCWrnJbKgIDs8MWdPbsmv1lu/lZD2s4Xvhr21/5mRztW+q3uYe NENIEB0MDP4pJyguEKAlm233NGcLlDY5hJpO9kEsL1fJRILD9yXvh+RBl+F0SJT6tQBV lSWA6nxfxzzQeQnoqIhXR8cWeJc/nBKEKbLMoPH8ocWTlR6FgJk3YfzL+cbFtfB1u6vN BlKw== X-Gm-Message-State: ALKqPwdLYPcYGN8NMet//yoVyYjySsX+eKaPTNJgB9yfo1mqGvgd2nop 3pG8wmmOpqDFsPgUq+J34/HNjbWGGwlHFPeOdnZpHqKv5QIgWHEBkhS4CGnrHFD4OPQRV1uBn41 j7S6Tpnme9amap1WYF2M+/YZvjpzXgKU4wxhuOJ+zgiEIvR2kuh07PfUnk0XNHRM= X-Received: by 2002:a62:9bc9:: with SMTP id e70-v6mr4399033pfk.15.1527789995384; Thu, 31 May 2018 11:06:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJy+dWYxAO0HqrM9ci8qPsCMExaptNOPiufqu7/pt4UMer83EK0Wefg5PieURhkwI5wd0L9 X-Received: by 2002:a62:9bc9:: with SMTP id e70-v6mr4398988pfk.15.1527789994555; Thu, 31 May 2018 11:06:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527789994; cv=none; d=google.com; s=arc-20160816; b=THc8ONRMs/uGTE8C51o/cNKshGZi55yr+paxU5gz2wx6Y5tMzwKi4iAdz67lSCW8h1 mELQqLxz93ifZnznAL8nX9qO/X5sr8YuZRcwook94pLTf5MEixCMKNuZmdaBJAheNEFN lqOsvvFE3nq1ZQd4OSHsJAskFcULCjxiOPvtSoAkKdf9H0QHeYvSVXkZvW0BYcnm53by 9T78Y0a+kkq0bG+kHQBP7SCvAjkTMFDFx/gCD3UXQguQs5aXgxYENH3Gf/CRgNuSZym7 Z6khhnj0g6J9fwaxKmP39Kehx8vh3NGjun/sEiCJB+xk/hGK7/FqHCrdeFKsU/aIoapI fBcg== 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=xVCPZL6Pk3QshLLRgPust+ON4xkY6wGv0bY4SECH0ls=; b=qZlykkf4+VPQOq/dC/DnYF7TiQpgVHKcSgwqIVcZl6sDS00tMTADgh5hqquS0rH3AP dL17PXsQxKOCyp+HmueKOjKsy5rLkyeVe0b3cpe27ciuI5Rjapzwj83reWpofnYUCsKK tBg8k7uCtWM9AvaJpsd7SHwZoy/C5EK2Am2jadmFEWtDylRO2YC5RImT71FxOPMTptx/ ACRoqRbk+25FC2B52/qEA9YPYAqI+7DM9mQxhiM5Cm65YbAc1K57eDhQgsdTx1dukIWW WDb7AyX57pL5wr3eBwQ1w1m4JG/kIs0OkUEZEL/uFu4uLeE+79sjenaiz/RaXrcK4fuV 2LPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Ktbh2NKu; 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 67-v6si14582631pge.373.2018.05.31.11.06.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 11:06:34 -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=Ktbh2NKu; 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=xVCPZL6Pk3QshLLRgPust+ON4xkY6wGv0bY4SECH0ls=; b=Ktbh2NKu0nmwlKNhZ7TJ7qHfr YndZhoyFPHvVNRGzBvTUqEUkN6Ziq4iRMscpbX58Qj5C97WqqR2X9rtN64P/8U86GL44j0pjwzviE GnsjmaL3Y/z0qqOW6DBzg/zo9PPl5q71ntOM3JYhN/ldrKSR31JYw8l3vGxGYWARaP9y2hRnIlUf9 DHfccp3dnfBi50+f1PWdgwy4sNZIx1zEnKQFTdOG9p70z55lXFxrLZVydgbZx1/EaO+mZqXmjDU6b dPywcf+5OJNwGnNDs2uiudM/1EL1IAhvqgVn7MizPFgs0FmY4Ip/ycuNXvJKu6nEmi/Pd5s0knaO6 ul0Fe/l/A==; 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 1fORxz-0003DQ-A5; Thu, 31 May 2018 18:06:27 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 03/13] mm: return an unsigned int from __do_page_cache_readahead Date: Thu, 31 May 2018 20:06:04 +0200 Message-Id: <20180531180614.21506-4-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 We never return an error, so switch to returning an unsigned int. Most callers already did implicit casts to an unsigned type, and the one that didn't can be simplified now. Suggested-by: Matthew Wilcox Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Darrick J. Wong --- mm/internal.h | 2 +- mm/readahead.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 62d8c34e63d5..954003ac766a 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -53,7 +53,7 @@ void unmap_page_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, struct zap_details *details); -extern int __do_page_cache_readahead(struct address_space *mapping, +extern unsigned int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, pgoff_t offset, unsigned long nr_to_read, unsigned long lookahead_size); diff --git a/mm/readahead.c b/mm/readahead.c index 16d0cb1e2616..fa4d4b767130 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -147,16 +147,16 @@ static int read_pages(struct address_space *mapping, struct file *filp, * * Returns the number of pages requested, or the maximum amount of I/O allowed. */ -int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, - pgoff_t offset, unsigned long nr_to_read, - unsigned long lookahead_size) +unsigned int __do_page_cache_readahead(struct address_space *mapping, + struct file *filp, pgoff_t offset, unsigned long nr_to_read, + unsigned long lookahead_size) { struct inode *inode = mapping->host; struct page *page; unsigned long end_index; /* The last page we want to read */ LIST_HEAD(page_pool); int page_idx; - int nr_pages = 0; + unsigned int nr_pages = 0; loff_t isize = i_size_read(inode); gfp_t gfp_mask = readahead_gfp_mask(mapping); @@ -223,16 +223,11 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp, max_pages = max_t(unsigned long, bdi->io_pages, ra->ra_pages); nr_to_read = min(nr_to_read, max_pages); while (nr_to_read) { - int err; - unsigned long this_chunk = (2 * 1024 * 1024) / PAGE_SIZE; if (this_chunk > nr_to_read) this_chunk = nr_to_read; - err = __do_page_cache_readahead(mapping, filp, - offset, this_chunk, 0); - if (err < 0) - return err; + __do_page_cache_readahead(mapping, filp, offset, this_chunk, 0); offset += this_chunk; nr_to_read -= this_chunk;