From patchwork Fri May 18 16:48: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: 10411235 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 3E5B6601F9 for ; Fri, 18 May 2018 16:49:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F40228619 for ; Fri, 18 May 2018 16:49:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 241B6288BD; Fri, 18 May 2018 16:49:00 +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 BFCCE28619 for ; Fri, 18 May 2018 16:48:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C77A6B0604; Fri, 18 May 2018 12:48:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 22AA06B0605; Fri, 18 May 2018 12:48:55 -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 006FA6B0606; Fri, 18 May 2018 12:48:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id A4CFC6B0604 for ; Fri, 18 May 2018 12:48:54 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id x23-v6so5043685pfm.7 for ; Fri, 18 May 2018 09:48:54 -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=Qm1sne40+hNR1EqxuRIe5gvTdj6DkoFlJUB+0Xq1ZKvH2dAKxfYljN03kB7oRQHvLh jt8FTG1v4z2aTquU3IrCiSvbDYSvtkoUjTavqS17tCbCNgW1pl5S8tXw0jxn6J+ENP9x I55TVP3U1ciAEqPv3unCuGjYjyHwVz2eFLSdYGvflfmVCkxRLPmzh8RuLQy0Zon8ndPm OfaxABNPdLMD7rGVYWwzofwzqtsx4Xp8FUz0qwnWGUMQdkDzfqgZiroV7lYLW48Rd90X tDmHcEQOo2AukBz48aoytIyZIUYq+5d0BYzrPeUj9T50UwpfKf1W9IhDiLzYiDWJen5t Ecfg== X-Gm-Message-State: ALKqPwedZ/wRDftU5mTM7OWIA04YimO2G3WCXi+s3opnuAtyh1u6bLMi ZMs13dZLcKR2y2aPQ8TE3FJ8cWllulDXBxu6GkRsy2agK7naly4R9bmvyxlf2jMtfuph2vI56ZN Hi9GDMUL5AwFKFudIGM8ZPiL4U+tCjMiC1xsf0cpwaYBJ4TNNcLDVG7/IWOR/0K0= X-Received: by 2002:a17:902:108a:: with SMTP id c10-v6mr10440398pla.111.1526662134370; Fri, 18 May 2018 09:48:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr6ac9ypoaHFU8No3QfkIFy6yr9ZQKqYym5sSkUmQIR9gir7WuPcM9MfQgdVQu7UDrDVHDA X-Received: by 2002:a17:902:108a:: with SMTP id c10-v6mr10440370pla.111.1526662133734; Fri, 18 May 2018 09:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662133; cv=none; d=google.com; s=arc-20160816; b=VMw9KzlTMcN5HYNFccOPbj9A47WpST694aBRUG2ifDI67abVOYrts6jbMt6tvpjp/x A2obLqDKPaMnhoHZsjAGaenstYSTPmLbEA311Imy91xsuXDTxkvNAfKXi6kvaJH3ACz7 opRwVPUPE8BrWpDhVTXIjCI6ZxccsOz5qwvVTlxSZoS5DwJs/OyM4eg/y7ZuxD2pStYv x4S6ZUW/2pVO6Mh6SLuDsV1kjubhKTEegMHYSZ6OklHGCTdOCXDK2mRBezN2vn/ONx14 mgxTKlt1wy0i2O2u0FChp7pEK8/v1fccFloi2xNKI8dzRuvITILKjOHh9N/gXdZTp/e5 J60A== 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=joXgyZIA/isopu7IdZ0wjEnQQWYZ6YQ3zGYzP8X5BMA7AETpxO4OuuN/jgvTf2JzEB GNaB5JOkc8mQ+8rC6z76f97YBMQvjFjrMB7mOBl9enbBGSvxbGOeZjrsr9k5depShcZ9 jfFGEL8QIdyuEqkL/LCaefJgpPrFX7Ml0GSatwwauw8GVOmlL1sLnoeyTAwllgzzSzyb pa7YGIf2kuMyQ/RZyS//j+EGDVAz0QXdnCS9P8v/IFqCjXnTDBoQ9ZwoGnb0UaMAXiRm dLqEnSfG87JU2e2TPIdrAnq1kxLPXsb5uLApCp6k7+bTwRJJCqNUIlJsM00JGt5I/vy0 iaPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Q+G/54xs; 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 h64-v6si6303623pge.206.2018.05.18.09.48.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:48:53 -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=Q+G/54xs; 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=J8oEFz8P+cHBe5E9hiQyMy48HN2WFld4KKtVoqjVEcM=; b=Q+G/54xsP5snHOOryQ2DBo+ED yT7cYPqbInsXz65AyC1lTXMkuun53UQzsiRVpiI7mjdxUWETC0qe5+X6mtozoY+B6vxcGH3eUef+9 CIAGJ+aY5n0mNi/TyuhzQ0aeF7Xr3jw3SD3cvq0j0urt1iS/LR6O6RpIy+eDZdVvr23Wth5IAlq4v twNb84U+WVNM/Dvxw3wPluEwStjV/2noex06jIutQDSGrFtwnK4Xxkkj0GHvxlEuYZTJKf5RN+ZFJ hCDqkZd4Yjl3blVvNnx0PUNS77nsea0PRbjjR3KiCfNCvlKpKpVHNG9v/4M7Q7CzHYwGQgVROC5uR dYq77+4Yw==; 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 1fJiYm-0006UY-ST; Fri, 18 May 2018 16:48:53 +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 07/34] mm: return an unsigned int from __do_page_cache_readahead Date: Fri, 18 May 2018 18:48:03 +0200 Message-Id: <20180518164830.1552-8-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 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 --- 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;