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=-12.5 required=3.0 tests=BAYES_00,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 ECAC0C00A89 for ; Mon, 2 Nov 2020 18:44:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6D502223BD for ; Mon, 2 Nov 2020 18:43:47 +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="lKrZrlFO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D502223BD 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 8DFD26B0083; Mon, 2 Nov 2020 13:43:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 63AC86B0089; Mon, 2 Nov 2020 13:43:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2457E6B0087; Mon, 2 Nov 2020 13:43:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id CC9E66B0085 for ; Mon, 2 Nov 2020 13:43:33 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 740C38249980 for ; Mon, 2 Nov 2020 18:43:33 +0000 (UTC) X-FDA: 77440351506.08.death06_1d0e504272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 4971B1819E785 for ; Mon, 2 Nov 2020 18:43:33 +0000 (UTC) X-HE-Tag: death06_1d0e504272b2 X-Filterd-Recvd-Size: 3383 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 18:43:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=MhaGM2ZGeDwxTv2rpzeXcoU4mMvsEnyn3vSYd9SK9Ns=; b=lKrZrlFOyo5i2BYg2CkDhPoyeo oVOeraG38fSUovw9klaZ8NccZMgZobBZMIzUdOSTnVK14ujz5UB/ZjFD+SBVz/G8DAx0h08TWEORI reHs/gyimctMbFymljtC0GX6MwlkC86AqENyTJADE4WDl3IAGLyBjwp+vfwDZRaKKnEsDGkOZtFB3 A3tJrlOctRFfoc+y4cBWMkvFi5pkL9iM896cTUNzy3gXIr56V04JFJ9YzhC+pOvVxiHGE3rCwZNOC lT2M3WyVJrkaoLa1lU9EEeLFfWWpF9Xf/M4C2HgTnIGqqrSRdMrb86M8zmdz9MzaDtc+bmFyeAwA9 9eaJaLSw==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZeng-0006pb-Ji; Mon, 02 Nov 2020 18:43:28 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hch@lst.de, kent.overstreet@gmail.com Subject: [PATCH 13/17] mm/filemap: Remove parameters from filemap_update_page() Date: Mon, 2 Nov 2020 18:43:08 +0000 Message-Id: <20201102184312.25926-14-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201102184312.25926-1-willy@infradead.org> References: <20201102184312.25926-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: The 'pos' and 'count' params are no longer used in filemap_update_page() Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 7c6380a3a871..0ae8305ccb97 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2259,7 +2259,7 @@ static bool filemap_range_uptodate(struct kiocb *io= cb, =20 static int filemap_update_page(struct kiocb *iocb, struct address_space *mapping, struct iov_iter *iter, - struct page *page, loff_t pos, loff_t count, bool first) + struct page *page, bool first) { int error =3D -EAGAIN; =20 @@ -2330,8 +2330,8 @@ static int filemap_readahead(struct kiocb *iocb, st= ruct file *file, { if (iocb->ki_flags & IOCB_NOIO) return -EAGAIN; - page_cache_async_readahead(mapping, ra, filp, page, - pg_index, last_index - pg_index); + page_cache_async_readahead(mapping, &file->f_ra, file, page, + page->index, last_index - page->index); return 0; } =20 @@ -2374,22 +2374,17 @@ static int filemap_get_pages(struct kiocb *iocb, = struct iov_iter *iter, got_pages: if (nr_got > 0) { struct page *page =3D pages[nr_got - 1]; - pgoff_t pg_index =3D page->index; - loff_t pg_pos =3D max(iocb->ki_pos, - (loff_t) pg_index << PAGE_SHIFT); - loff_t pg_count =3D iocb->ki_pos + iter->count - pg_pos; =20 if (PageReadahead(page)) err =3D filemap_readahead(iocb, filp, mapping, page, last_index); if (!err && !PageUptodate(page)) err =3D filemap_update_page(iocb, mapping, iter, page, - pg_pos, pg_count, nr_got =3D=3D 1); + nr_got =3D=3D 1); if (err) nr_got--; } =20 -err: if (likely(nr_got)) return nr_got; if (err < 0) --=20 2.28.0