From patchwork Wed May 30 09:58: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: 10438131 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 CCECE603D7 for ; Wed, 30 May 2018 09:58:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD8DA2818E for ; Wed, 30 May 2018 09:58:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2191283CB; Wed, 30 May 2018 09:58: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 55996281D2 for ; Wed, 30 May 2018 09:58:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6ED296B0266; Wed, 30 May 2018 05:58:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6996A6B0269; Wed, 30 May 2018 05:58: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 53B676B026A; Wed, 30 May 2018 05:58:31 -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 11C086B0266 for ; Wed, 30 May 2018 05:58:31 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id d4-v6so11034721plr.17 for ; Wed, 30 May 2018 02:58:31 -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=b9H+ps7mn17FxB1+I9Q/RONVMFqMZfpsGoEGR1HWq68=; b=mGnxVtsQd0knZxaPNaQCDyk2C4c48blqzvCzT8B2eV6CmvhFqSUvDgSopLO3ntgR6x 2uYv4gWw28HJ0I1ph0qbt8GEIA+wWT6CuaTsTGZuvT2skgMEI0ypULRK/GHvHwYhcEmu BhVXPkb2MjTAE5NGzKA0unuv17m+Jx1/eFrC30twIKMUFdZhiABLY+PjCoEivDUSec4W cwBastUg/mmF96E7fIoyDOE2rhoVWz0p579qFakS80uj6jEps1dQipLj+H6f03E1/dqU 8US5GMF6cdfQDl9pJ+iTPCYliz5OTtezkqTBLiy82T9Cu8vVRsIplt93sJ7+Cm7bL2j2 IGZg== X-Gm-Message-State: ALKqPweNE0HXm6toLiMW7YPwtk+4cXUlCHOH60vlV6JmDByKgiAxbyLR WJAyp6FyFsyIm0CfcCrLGDTasMigZDts4aR2mcdRBJSV3agoLES96kUplXZGeMxRHYkUNdThYLX 271Py/2mmbzya8lKX88nuSKnFcPGt8Mh339e8Uawp7dWAMReaD+H1XG33Rl8gXv4= X-Received: by 2002:a62:ea1a:: with SMTP id t26-v6mr2140727pfh.117.1527674310745; Wed, 30 May 2018 02:58:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJUMvKH+RtcDeadQ4+UCuIR7Yf5l67jUxlXQuECcjwuulQhVBb8dPUx1Kb2ASPemYfyt908 X-Received: by 2002:a62:ea1a:: with SMTP id t26-v6mr2140693pfh.117.1527674310051; Wed, 30 May 2018 02:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674310; cv=none; d=google.com; s=arc-20160816; b=HoK3oEGdlHkzI14nPrtzv8/HZWfpY4KwEldQ1QqoF9CCOlZOVQKOXbnvJN7uE6XdUw 019IdzhV1KDvpJuq05BNs54UkMvdYOVc7DEOmByAWHmyFlQeXYj+MxqHkfBhQJESH5Id 9EcqK+48T5biRd/MRv++f3/5Js90rmgMrwrcVKP8EIF+IRtwO/1Gn+r2kbnpnEiANqKe SgpnZ+tw/GezKi7Bzf1s8nz10HF2+T/AII9YMjIXwThSHk8djJVLL+YORsAMrKBp3XCV fniu2kYuhWUIXvf/XEthf4n1qmHQq0mQeixfZUhkq0JRBhF/7J+pxPSOE0DoPBHMQrh4 YNDQ== 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=b9H+ps7mn17FxB1+I9Q/RONVMFqMZfpsGoEGR1HWq68=; b=v5ZldESa/9C43mLXIsp6GRZc+PRM7ojhkouQLlHD+5rMxcTHLL0NruuJtLr1UMfIRv /Mbm24bcbOeJVE0Kw6xsOfiwLpObFuWbHDDiV4e1N2XdIHbEGEHyalKOPGQgmHJ24xqN liNiVmScDqv4Ho+PjV/oHDMLGyDVbZH+OKTGLDD/M/Kck6PEFx30Y+rpKxU9FI3F17D7 cAONY1sMHA+VWKRH28LsCLxatXDWViEbT9hf+5I+50nyTP3SUWyBjq6JBXO5Teff6oZm 4eMVUKABMhfzJrp0lbK+t2St7nXiqJe2mha9krvOi0EC9LBhZH/bYWUvqpvcYnekCHT9 yY0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=QszgOVku; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+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 w10-v6si7373057pgt.404.2018.05.30.02.58.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 02:58:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+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=QszgOVku; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+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=b9H+ps7mn17FxB1+I9Q/RONVMFqMZfpsGoEGR1HWq68=; b=QszgOVkuWH6v3DHEi+MmyVy7b x1B1ep89k/6jeN/9LEC8oLreydQVbPogNspje7ZVenC3CkD3037CFcMUWPR8GR8JU5tW0HFeVEojq OpVyI7N2NScW54DU2LMuF3fpEkcJCe3TGwJmZ5FlKHAw0U7LUZINf1/JeWVw98dC8QDkKQbl9AvRX czJnrM9FoVLSpmoCRubFyX3jbJLk5Vk0zXfRjBAxvXnbecDlMmjN4tUA4BG1Gh+sfqmCSZl/V4YRG XNDClfAblE3Vrfcz732uPhQRmgr9EOGvI/QcbAPxMUXTFAwSdP7VLZrw/Dx1gslOhbElu+EnZJOKQ MlgZow/jA==; 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 1fNxsC-0006ST-Pb; Wed, 30 May 2018 09:58:29 +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: Wed, 30 May 2018 11:58:03 +0200 Message-Id: <20180530095813.31245-4-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530095813.31245-1-hch@lst.de> References: <20180530095813.31245-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 Reviewed-by: Dave Chinner --- 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;