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.6 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 6C674C2D0A3 for ; Tue, 10 Nov 2020 03:37:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EBBCC20731 for ; Tue, 10 Nov 2020 03:37:45 +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="eRNvWryA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBBCC20731 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 4B4506B0080; Mon, 9 Nov 2020 22:37:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 32C206B0081; Mon, 9 Nov 2020 22:37:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 154D36B0082; Mon, 9 Nov 2020 22:37:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0126.hostedemail.com [216.40.44.126]) by kanga.kvack.org (Postfix) with ESMTP id D7A0F6B0080 for ; Mon, 9 Nov 2020 22:37:24 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 87A7F3629 for ; Tue, 10 Nov 2020 03:37:24 +0000 (UTC) X-FDA: 77467098408.01.form95_1810ff2272f1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 6660310047BE5 for ; Tue, 10 Nov 2020 03:37:24 +0000 (UTC) X-HE-Tag: form95_1810ff2272f1 X-Filterd-Recvd-Size: 3138 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Nov 2020 03:37:23 +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=/H3/vcaymJlMFs25KAXkG6a5fN3Vb71fAtWaKtHODt4=; b=eRNvWryA9rpDxrN9nNLez0BqZL TLobkC+gMfJYPs6ChjJTUsl2onQ5xugxL6ArAMrSHZEDeHsuuNHFTlmm6Ji1RZl9rtUVhbXErhoIO Wz9TSXTkKUemVbk6XCV+bTYOisMuvmEWHtkRjNESw3wZbF53SoKylFe3sauPZ4O5mSjWK2UJogax9 riZ5XXwVSGcMh8TJ77divALGRN0PEO884QuzwuZaAOOeH8M1LTlKCvBSsHn45wxwQvhgurmDvGPvk rye3oglpsWZ7iFbM9vkvMp+L5tYdK2nu+6930NJ2io3pJyd2nEYH4H+OU1IuEasOsscXV/6ESQOfu 6O+KJ87A==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcKT7-000679-29; Tue, 10 Nov 2020 03:37:17 +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 v3 14/18] mm/filemap: Split filemap_readahead out of filemap_get_pages Date: Tue, 10 Nov 2020 03:36:59 +0000 Message-Id: <20201110033703.23261-15-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201110033703.23261-1-willy@infradead.org> References: <20201110033703.23261-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: This simplifies the error handling. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet --- mm/filemap.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1cacadef0ded..d9cabdff9245 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2330,6 +2330,17 @@ static int filemap_create_page(struct file *file, return error; } =20 +static int filemap_readahead(struct kiocb *iocb, struct file *file, + struct address_space *mapping, struct page *page, + pgoff_t last_index) +{ + if (iocb->ki_flags & IOCB_NOIO) + return -EAGAIN; + page_cache_async_readahead(mapping, &file->f_ra, file, page, + page->index, last_index - page->index); + return 0; +} + static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter, struct pagevec *pvec) { @@ -2367,17 +2378,15 @@ static int filemap_get_pages(struct kiocb *iocb, = struct iov_iter *iter, got_pages: { struct page *page =3D pvec->pages[pvec->nr - 1]; - pgoff_t pg_index =3D page->index; =20 if (PageReadahead(page)) { - if (iocb->ki_flags & IOCB_NOIO) { + err =3D filemap_readahead(iocb, filp, mapping, page, + last_index); + if (err) { put_page(page); pvec->nr--; - err =3D -EAGAIN; goto err; } - page_cache_async_readahead(mapping, ra, filp, page, - pg_index, last_index - pg_index); } =20 if (!PageUptodate(page)) { --=20 2.28.0