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.5 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 50C32C433ED for ; Fri, 30 Apr 2021 18:35:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ECFD36141E for ; Fri, 30 Apr 2021 18:35:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECFD36141E 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 826EA6B006E; Fri, 30 Apr 2021 14:35:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D5886B0070; Fri, 30 Apr 2021 14:35:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C4E66B0071; Fri, 30 Apr 2021 14:35:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 52B296B006E for ; Fri, 30 Apr 2021 14:35:16 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0370F4FF4 for ; Fri, 30 Apr 2021 18:35:16 +0000 (UTC) X-FDA: 78089885832.01.9A489F0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id BB11680192E7 for ; Fri, 30 Apr 2021 18:34:50 +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=XYgU/mxGpMg6788kBivmC+CFJRz8io5Yl8KEUo/0zCQ=; b=E/aRKo7cdifr66ckQVXp1SV3Tr tUh1GC++kGwwop9o4eEQwy24t7x42e86QzQX0kZewnF+6khbMwTdSDwCz0WQzlUJnKAj5rahq2P0o xEr1+YetVMyP/uavLDGd+9ykPg11aEfGPyNb0hHKqmxp3mYpePB8KPsr46JL8vHk8fHib3HKsJp6W kNJlYcBpduWyb10LibCgjCH+R52OJ4n97JZK0xInmyOeWJ82z6R5wc2aMBgDEiCv8mRLRB6NGj+NH KhCduuy/2NfbTfDBid/cMkAhBZnwYW9O/NNqZcH4ETsvZeiyCBNrqotwAbg6cx/cyccPBGw5K0jbt He52ee9g==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lcXxQ-00BO41-Gc; Fri, 30 Apr 2021 18:33:53 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v8 30/31] mm/filemap: Add folio private_2 functions Date: Fri, 30 Apr 2021 19:07:39 +0100 Message-Id: <20210430180740.2707166-31-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210430180740.2707166-1-willy@infradead.org> References: <20210430180740.2707166-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="E/aRKo7c"; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: BB11680192E7 X-Stat-Signature: bsu1ymueu15srbda654afy3qgjd4yx33 Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf27; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619807690-125347 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: end_page_private_2() becomes folio_end_private_2(), wait_on_page_private_2() becomes folio_wait_private_2() and wait_on_page_private_2_killable() becomes folio_wait_private_2_killable()= . Adjust the fscache equivalents to call page_folio() before calling these functions to avoid adding wrappers. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/netfs.h | 6 +++--- include/linux/pagemap.h | 6 +++--- mm/filemap.c | 37 ++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 9062adfa2fb9..fad8c6209edd 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -55,7 +55,7 @@ static inline void set_page_fscache(struct page *page) */ static inline void end_page_fscache(struct page *page) { - end_page_private_2(page); + folio_end_private_2(page_folio(page)); } =20 /** @@ -66,7 +66,7 @@ static inline void end_page_fscache(struct page *page) */ static inline void wait_on_page_fscache(struct page *page) { - wait_on_page_private_2(page); + folio_wait_private_2(page_folio(page)); } =20 /** @@ -82,7 +82,7 @@ static inline void wait_on_page_fscache(struct page *pa= ge) */ static inline int wait_on_page_fscache_killable(struct page *page) { - return wait_on_page_private_2_killable(page); + return folio_wait_private_2_killable(page_folio(page)); } =20 enum netfs_read_source { diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index d8204a3d6734..f68bd82837a4 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -853,9 +853,9 @@ static inline void set_page_private_2(struct page *pa= ge) SetPagePrivate2(page); } =20 -void end_page_private_2(struct page *page); -void wait_on_page_private_2(struct page *page); -int wait_on_page_private_2_killable(struct page *page); +void folio_end_private_2(struct folio *folio); +void folio_wait_private_2(struct folio *folio); +int folio_wait_private_2_killable(struct folio *folio); =20 /* * Add an arbitrary waiter to a page's wait queue diff --git a/mm/filemap.c b/mm/filemap.c index 94d4ad7432d3..3cf1d7fbd0b1 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1449,56 +1449,51 @@ void folio_unlock(struct folio *folio) EXPORT_SYMBOL(folio_unlock); =20 /** - * end_page_private_2 - Clear PG_private_2 and release any waiters - * @page: The page + * folio_end_private_2 - Clear PG_private_2 and wake any waiters. + * @folio: The folio. * - * Clear the PG_private_2 bit on a page and wake up any sleepers waiting= for - * this. The page ref held for PG_private_2 being set is released. + * Clear the PG_private_2 bit on a folio and wake up any sleepers waitin= g for + * it. The page ref held for PG_private_2 being set is released. * * This is, for example, used when a netfs page is being written to a lo= cal * disk cache, thereby allowing writes to the cache for the same page to= be * serialised. */ -void end_page_private_2(struct page *page) +void folio_end_private_2(struct folio *folio) { - struct folio *folio =3D page_folio(page); - VM_BUG_ON_FOLIO(!folio_private_2(folio), folio); clear_bit_unlock(PG_private_2, folio_flags(folio, 0)); folio_wake_bit(folio, PG_private_2); folio_put(folio); } -EXPORT_SYMBOL(end_page_private_2); +EXPORT_SYMBOL(folio_end_private_2); =20 /** - * wait_on_page_private_2 - Wait for PG_private_2 to be cleared on a pag= e - * @page: The page to wait on + * folio_wait_private_2 - Wait for PG_private_2 to be cleared on a page. + * @folio: The folio to wait on. * - * Wait for PG_private_2 (aka PG_fscache) to be cleared on a page. + * Wait for PG_private_2 (aka PG_fscache) to be cleared on a folio. */ -void wait_on_page_private_2(struct page *page) +void folio_wait_private_2(struct folio *folio) { - struct folio *folio =3D page_folio(page); - while (folio_private_2(folio)) folio_wait_bit(folio, PG_private_2); } -EXPORT_SYMBOL(wait_on_page_private_2); +EXPORT_SYMBOL(folio_wait_private_2); =20 /** - * wait_on_page_private_2_killable - Wait for PG_private_2 to be cleared= on a page - * @page: The page to wait on + * folio_wait_private_2_killable - Wait for PG_private_2 to be cleared o= n a folio. + * @folio: The folio to wait on. * - * Wait for PG_private_2 (aka PG_fscache) to be cleared on a page or unt= il a + * Wait for PG_private_2 (aka PG_fscache) to be cleared on a folio or un= til a * fatal signal is received by the calling task. * * Return: * - 0 if successful. * - -EINTR if a fatal signal was encountered. */ -int wait_on_page_private_2_killable(struct page *page) +int folio_wait_private_2_killable(struct folio *folio) { - struct folio *folio =3D page_folio(page); int ret =3D 0; =20 while (folio_private_2(folio)) { @@ -1509,7 +1504,7 @@ int wait_on_page_private_2_killable(struct page *pa= ge) =20 return ret; } -EXPORT_SYMBOL(wait_on_page_private_2_killable); +EXPORT_SYMBOL(folio_wait_private_2_killable); =20 /** * folio_end_writeback - End writeback against a folio. --=20 2.30.2