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 D7972C4BA10 for ; Tue, 25 Feb 2020 21:49:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9C4AA24676 for ; Tue, 25 Feb 2020 21:49:11 +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="J0Z0pWj2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C4AA24676 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 416766B000A; Tue, 25 Feb 2020 16:48:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1251E6B0073; Tue, 25 Feb 2020 16:48:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93CE36B0071; Tue, 25 Feb 2020 16:48:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0236.hostedemail.com [216.40.44.236]) by kanga.kvack.org (Postfix) with ESMTP id F14BA6B0070 for ; Tue, 25 Feb 2020 16:48:45 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 97FEE8245578 for ; Tue, 25 Feb 2020 21:48:45 +0000 (UTC) X-FDA: 76529989410.29.flag85_2f527cfe69146 X-HE-Tag: flag85_2f527cfe69146 X-Filterd-Recvd-Size: 3634 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Tue, 25 Feb 2020 21:48:45 +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=3TMgSG02JhQuKh6rH+8zrGgozkTFigPbE53A1/N3QvI=; b=J0Z0pWj2wd0GnXi6lQZJo/1S7b pBXvaPHRxbU4KCuEHDqkI3YaD4LG4Oy4Ni/ihp1ZUkGA5w0fRkk7TzuDnLmqFuyEFgyivrr5ccMmR agqJOU3rE4mSmKAXfVSYL7pGONxbLJGrdCFQDPvqrnhBm4WHwWWKh+Nqi2cMMbahKxOP1u9baLdHb v6AapMZuiO2WoqR8DNNKW0OeVjqjZuXJw8HHyV3aMyvvv5v1gYp7Kr+nHt34mkwrCiTmuaANfX+0O C37lc8OsVbN9xG3teukeIJwLdb+fu9Uzflwi/07g9rcMQ03dzu+vpk9bKk3hbaUAR92qONfihWzZy etlBxgTA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6i4H-0007pT-1j; Tue, 25 Feb 2020 21:48:41 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , 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, Zi Yan , John Hubbard , Christoph Hellwig Subject: [PATCH v8 04/25] mm: Move readahead nr_pages check into read_pages Date: Tue, 25 Feb 2020 13:48:17 -0800 Message-Id: <20200225214838.30017-5-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200225214838.30017-1-willy@infradead.org> References: <20200225214838.30017-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)" Simplify the callers by moving the check for nr_pages and the BUG_ON into read_pages(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Zi Yan Reviewed-by: John Hubbard Reviewed-by: Christoph Hellwig --- mm/readahead.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 61b15b6b9e72..9fcd4e32b62d 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -119,6 +119,9 @@ static void read_pages(struct address_space *mapping,= struct file *filp, struct blk_plug plug; unsigned page_idx; =20 + if (!nr_pages) + return; + blk_start_plug(&plug); =20 if (mapping->a_ops->readpages) { @@ -138,6 +141,8 @@ static void read_pages(struct address_space *mapping,= struct file *filp, =20 out: blk_finish_plug(&plug); + + BUG_ON(!list_empty(pages)); } =20 /* @@ -180,8 +185,7 @@ void __do_page_cache_readahead(struct address_space *= mapping, * contiguous pages before continuing with the next * batch. */ - if (nr_pages) - read_pages(mapping, filp, &page_pool, nr_pages, + read_pages(mapping, filp, &page_pool, nr_pages, gfp_mask); nr_pages =3D 0; continue; @@ -202,9 +206,7 @@ void __do_page_cache_readahead(struct address_space *= mapping, * uptodate then the caller will launch readpage again, and * will then handle the error. */ - if (nr_pages) - read_pages(mapping, filp, &page_pool, nr_pages, gfp_mask); - BUG_ON(!list_empty(&page_pool)); + read_pages(mapping, filp, &page_pool, nr_pages, gfp_mask); } =20 /* --=20 2.25.0