From patchwork Wed May 23 14:43:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421495 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 C6D4B6032A for ; Wed, 23 May 2018 14:44:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5C0B28733 for ; Wed, 23 May 2018 14:44:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA9B328802; Wed, 23 May 2018 14:44:34 +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 2AD6528733 for ; Wed, 23 May 2018 14:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05D696B026A; Wed, 23 May 2018 10:44:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E638F6B026C; Wed, 23 May 2018 10:44:25 -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 C67916B026D; Wed, 23 May 2018 10:44:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 79CA86B026A for ; Wed, 23 May 2018 10:44:25 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id g92-v6so14255576plg.6 for ; Wed, 23 May 2018 07:44:25 -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=J8oEFz8P+cHBe5E9hiQyMy48HN2WFld4KKtVoqjVEcM=; b=bzsdMYfb7mtdP/oGaFnjWd9kNotURkDb/OGUgEoOjzV2JV/C9IbHubEfsKyAGS4U+H B7SXSOOHI5g7CChmlialfOD8YQ6M62VDv5piS//Ijt4XfZ025diFkDcVqLpEmTAgVzMt Yf4T/q/t0x1eb439S4G2HvnL/GpZS2ku6knHuq7nVh5kSL0VspRiOHwUxaB7IRJcGHyl fAk4XggdvQqigQhgxnn1GAaI/wXBnhdSORwmxNZMQXY4rD0N5mxA4+SJeZ3JSN2CMNUi 9YDY3bPS7V3OmXby1npoHVBxE+Msxxj3gK3V2RsM1kMAlMBX6JFwAy9T7H9uyR7qLyuL Ptyg== X-Gm-Message-State: ALKqPwebkArfIReuLrm61UQpVbF4+1M9MMyOeOeigMDqfZwPjsFLiZr2 h6jxkqlb68Cf6dZsPq5Lmz0mEbM/gE2mv5SWfAXRXVHxUaU8L7lnCeLTBCivPQITzFoJgafw7Ut /OeHXTmWFhzaoPB8Pb8eJUrXESqoQAoWKE4JSjjx32c3FHMu95QUIZMDOx19K8hE= X-Received: by 2002:a62:883:: with SMTP id 3-v6mr3260260pfi.154.1527086665182; Wed, 23 May 2018 07:44:25 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrQLmsD2sGsQX+rf+89dKCHBclBjD/ECOd7fimInD0MpAhzzgoWi+S/PQPzPtDw+N6QDB21 X-Received: by 2002:a62:883:: with SMTP id 3-v6mr3260222pfi.154.1527086664440; Wed, 23 May 2018 07:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086664; cv=none; d=google.com; s=arc-20160816; b=oTHsPe/dETtnVlwS5PzS93i8ogA/+Po9EWZ29/nHn3CaUVjBgQbL+RSKrHGFr/v8PD olVt05p7AYfeyqqYRlU0ZsqdZxA0ZuF3vTquHLs/9mhqHLtUCIVc8zQChAFhXrxk89P4 AbBjKNPg4Nn/BPs4D4LH0Lgvms+8IEGDlrhI77Bv7K8J2fb/yxSn88/5FQeTxmVru/4P aY4+HmiFoBk3+MPgWdh7MYYHAMU9kd6niG4hjaeibq49UlDUWpX8gy6zCcRxPyZBumb9 ucTIuSROMK3AZQrr6zDjEeQWoElWySwfnbqLmzL2MXlI+4pexIjxBZeD6FqiwJeisGSQ H1LA== 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=J8oEFz8P+cHBe5E9hiQyMy48HN2WFld4KKtVoqjVEcM=; b=AQC9jaZWcPMG5K0dA6AAxJm02BOCYQiUoWt76w6xSNNXUFtalOuCBr+nJ8Fv4MQ0Rn h20hTFnXDR1OJh14HQ53igo8s6YH8VJCjfJV3NHjyD7wYVzweh/g8/9Lt2VLveV6yNwt AyuKT4TeXWEhiureAkq3smMNqTSOwOwxVYCW/ECY1PuKyf9wM2p+6p2J1pFTE3ICPR+n jtCQbAVzdkh6F5sKU0Zs5pY1ZzD4bkneGqkLK1+6xnZOYAoSXoPGqwKp+DxOHxesbA+R FUM54qeUH6fGjr1gMTMmrBoy/FgpqBgoqq2NE+dF2cupJiROEXMQRmkBRDlNXH0vKMgw 5Jvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=roja01up; 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 o11-v6si8897836pgp.331.2018.05.23.07.44.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:44:24 -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=roja01up; 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=J8oEFz8P+cHBe5E9hiQyMy48HN2WFld4KKtVoqjVEcM=; b=roja01upbg+2hfwmbGs8vYOTZ 1ewcqbebbt6mGZBIG72GvgYERO4pc1EdYSn0F/u1Qu00kl2od/U2XtI12CfKFmAse+aqyzvfoNy0b 82X9kKlm3NUVSfi/qgQLV4pSbGafVRTVBoTrJu7bF82o7eNgbVpbzYATX59ZV4UTFYlLWxOMvifJa Kd3kMJO5xfT+cja7+jjOd2wER8ZJIPGr/alNhQlWxpBfcuFrwHy3LXz7qywNCuwNBs3bt5NKuWyyP eQB76SHzBc00+ChkGIsp8hJe/LCsPHs2K+DaNBH2X8ZuZIIm0Pn94gws+s5Z9BZD7bd/+JPgHMO21 KN0GutYnA==; 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 1fLV02-0000J3-Ms; Wed, 23 May 2018 14:44:23 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 07/34] mm: return an unsigned int from __do_page_cache_readahead Date: Wed, 23 May 2018 16:43:30 +0200 Message-Id: <20180523144357.18985-8-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 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: 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;