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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 49643C433E0 for ; Mon, 18 Jan 2021 17:03:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EB8FB22C9C for ; Mon, 18 Jan 2021 17:03:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB8FB22C9C 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 595996B0258; Mon, 18 Jan 2021 12:03:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5456E6B025A; Mon, 18 Jan 2021 12:03:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3BFD16B025B; Mon, 18 Jan 2021 12:03:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0155.hostedemail.com [216.40.44.155]) by kanga.kvack.org (Postfix) with ESMTP id 2094F6B0258 for ; Mon, 18 Jan 2021 12:03:51 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id DE428180ACC20 for ; Mon, 18 Jan 2021 17:03:50 +0000 (UTC) X-FDA: 77719517820.20.voice61_5603cb32754a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 21E91180BF32E for ; Mon, 18 Jan 2021 17:03:31 +0000 (UTC) X-HE-Tag: voice61_5603cb32754a X-Filterd-Recvd-Size: 4833 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Mon, 18 Jan 2021 17:03:30 +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=29ihG3xZAVE81H4LadxPn1TMPDKRCe/1A1Z2RRLt+j4=; b=ASYVqcvM/jSp/unq2q+YR91LRN RyUrJa7CPtd29B5q9OqfSA/7c2RekdkQjVR8Y/fgZ7MCzLZ9ddw+II8hkhV+o6tlTcSpX5AxMU0B/ YcyF1y+4csi9RMVPl0fE5nwxu2DfVVKnQr8idWkOAeyW7CVGNI/9Ia/jD9WPq2T2NSGwgOeVMpqgK +rAhNyoZ++uaYKx8CeSnqeHiooEb71cgcvyxwUlVNHDHsefRKY/Ion9oHDRCNE49vtn+9oWNPfnm/ 5hrZOV4j7YQsvfcx7Hol1pWcEbOsbCmcOp6RsGL5bHXwRGZFjiPp+RFD+jyrl9KVXiH6of5pg+lu4 FKoOw7oA==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l1Xvz-00D7VL-4Z; Mon, 18 Jan 2021 17:03:19 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v2 21/27] mm: Add wait_for_stable_folio and wait_on_folio_writeback Date: Mon, 18 Jan 2021 17:01:42 +0000 Message-Id: <20210118170148.3126186-22-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210118170148.3126186-1-willy@infradead.org> References: <20210118170148.3126186-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: Add compatibility wrappers for code which has not yet been converted to use folios. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 12 ++++++++++-- mm/page-writeback.c | 27 +++++++++++++-------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 685f1b394629..619bfc6ea1ff 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -746,13 +746,21 @@ static inline int wait_on_page_locked_killable(stru= ct page *page) =20 extern void put_and_wait_on_page_locked(struct page *page); =20 -void wait_on_page_writeback(struct page *page); +void wait_on_folio_writeback(struct folio *folio); +static inline void wait_on_page_writeback(struct page *page) +{ + return wait_on_folio_writeback(page_folio(page)); +} void end_folio_writeback(struct folio *folio); static inline void end_page_writeback(struct page *page) { return end_folio_writeback(page_folio(page)); } -void wait_for_stable_page(struct page *page); +void wait_for_stable_folio(struct folio *folio); +static inline void wait_for_stable_page(struct page *page) +{ + return wait_for_stable_folio(page_folio(page)); +} =20 void page_endio(struct page *page, bool is_write, int err); =20 diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 51b4326f0aaa..908fc7f60ae7 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2822,30 +2822,29 @@ int __test_set_page_writeback(struct page *page, = bool keep_write) EXPORT_SYMBOL(__test_set_page_writeback); =20 /* - * Wait for a page to complete writeback + * Wait for a folio to complete writeback */ -void wait_on_page_writeback(struct page *page) +void wait_on_folio_writeback(struct folio *folio) { - struct folio *folio =3D page_folio(page); while (FolioWriteback(folio)) { - trace_wait_on_page_writeback(page, folio_mapping(folio)); + trace_wait_on_page_writeback(&folio->page, + folio_mapping(folio)); wait_on_folio_bit(folio, PG_writeback); } } -EXPORT_SYMBOL_GPL(wait_on_page_writeback); +EXPORT_SYMBOL_GPL(wait_on_folio_writeback); =20 /** - * wait_for_stable_page() - wait for writeback to finish, if necessary. - * @page: The page to wait on. + * wait_for_stable_folio() - wait for writeback to finish, if necessary. + * @folio: The folio to wait on. * - * This function determines if the given page is related to a backing de= vice - * that requires page contents to be held stable during writeback. If s= o, then + * This function determines if the given folio is related to a backing d= evice + * that requires folio contents to be held stable during writeback. If = so, then * it will wait for any pending writeback to complete. */ -void wait_for_stable_page(struct page *page) +void wait_for_stable_folio(struct folio *folio) { - page =3D thp_head(page); - if (page->mapping->host->i_sb->s_iflags & SB_I_STABLE_WRITES) - wait_on_page_writeback(page); + if (folio->page.mapping->host->i_sb->s_iflags & SB_I_STABLE_WRITES) + wait_on_folio_writeback(folio); } -EXPORT_SYMBOL_GPL(wait_for_stable_page); +EXPORT_SYMBOL_GPL(wait_for_stable_folio); --=20 2.29.2