From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDF5CC54FCF for ; Mon, 23 Mar 2020 20:24:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B2F7F20753 for ; Mon, 23 Mar 2020 20:24:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="MlxozusR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2F7F20753 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 857308E0009; Mon, 23 Mar 2020 16:23:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DFB08E0006; Mon, 23 Mar 2020 16:23:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A7F08E0008; Mon, 23 Mar 2020 16:23:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 4A65B8E0006 for ; Mon, 23 Mar 2020 16:23:16 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0B17E1803CA10 for ; Mon, 23 Mar 2020 20:23:16 +0000 (UTC) X-FDA: 76627751592.04.badge52_90e76865cba50 X-HE-Tag: badge52_90e76865cba50 X-Filterd-Recvd-Size: 3371 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Mar 2020 20:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=yWCBnvZVE3mmN89bJgz6VBayzBfFVIn+l+u0xcbyIA0=; b=MlxozusRJi0Z4Hoj/bZGAJFztH GlgKI82G0NG7WhlTpC4WWlrBvUEB5r++IluhCI9V08mkalhQC9RsC+pUhqYbBZ+2HfpgbWyHdiBNA hLBmArwC1OPSrO80PBTn4xplmWh1s87hoDR1/ek5kYYGMnR+/jbXA9Us3dz7gB8ANaulTpPZUo3l8 SnIw1hysXy65IMNv2WrkbMoAqGdV0YkRwchiYg0t7iq4uOeL+l31kWqZ1AGBO1L+wT0c4BMLOjZGQ p//FhyIDd2OxuM8mOrhQAGEbU3fQZRd8151F9VG7tOALTONV9B2mO7+4aiswPhM4j2H/YXdnZkETC TGv1Ugew==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGTbB-0003V1-LW; Mon, 23 Mar 2020 20:23:01 +0000 From: Matthew Wilcox To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, ocfs2-devel@oss.oracle.com, linux-xfs@vger.kernel.org, John Hubbard , Christoph Hellwig , William Kucharski Subject: [PATCH v10 09/25] mm: Remove 'page_offset' from readahead loop Date: Mon, 23 Mar 2020 13:22:43 -0700 Message-Id: <20200323202259.13363-10-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200323202259.13363-1-willy@infradead.org> References: <20200323202259.13363-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: From: "Matthew Wilcox (Oracle)" Replace the page_offset variable with 'index + i'. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: John Hubbard Reviewed-by: Christoph Hellwig Reviewed-by: William Kucharski --- mm/readahead.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 7ce320854bad..ddc63d3b07b8 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -180,12 +180,10 @@ void __do_page_cache_readahead(struct address_space= *mapping, * Preallocate as many pages as we will need. */ for (i =3D 0; i < nr_to_read; i++) { - pgoff_t page_offset =3D index + i; - - if (page_offset > end_index) + if (index + i > end_index) break; =20 - page =3D xa_load(&mapping->i_pages, page_offset); + page =3D xa_load(&mapping->i_pages, index + i); if (page && !xa_is_value(page)) { /* * Page already present? Kick off the current batch of @@ -199,7 +197,7 @@ void __do_page_cache_readahead(struct address_space *= mapping, page =3D __page_cache_alloc(gfp_mask); if (!page) break; - page->index =3D page_offset; + page->index =3D index + i; list_add(&page->lru, &page_pool); if (i =3D=3D nr_to_read - lookahead_size) SetPageReadahead(page); --=20 2.25.1