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 56400C433B4 for ; Fri, 9 Apr 2021 19:12:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E3FD061165 for ; Fri, 9 Apr 2021 19:12:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3FD061165 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 783A36B006C; Fri, 9 Apr 2021 15:12:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7334D6B006E; Fri, 9 Apr 2021 15:12:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FC8A6B0070; Fri, 9 Apr 2021 15:12:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0094.hostedemail.com [216.40.44.94]) by kanga.kvack.org (Postfix) with ESMTP id 46B1A6B006C for ; Fri, 9 Apr 2021 15:12:32 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 02C93824805A for ; Fri, 9 Apr 2021 19:12:32 +0000 (UTC) X-FDA: 78013774944.38.8CE8038 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 22E9F80192C0 for ; Fri, 9 Apr 2021 19:12:31 +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=jAqapOL6/Q7ges0ll0u4wMviUWG3R6VVJlANPuTC5Tc=; b=plkPzPgJ9L3NdtLtOy7OCld88H 4ANipG3gob05ukIQJwXhmCy8Z3UkEilYFLQYu7bEpFvhSsRu4WDbcbnU1KjPaD7/aZlqU9YMesdav D3VSL9ETfUu5mygvMfdCsEKuXCjoRKtEzNugxs6W4O+mk8uSg8BZSP3hINEp5XhQLPnS2AMADg8Cr l8EZQ5j605Qu8x7ZXXGwDMZsmHs+6rUPkUt4veW4R2QM9tAYGyky5V9zgAwlvSQUMlstFNwHMUtak REEHW+jJQOrnnBywA7jHeRK1lQGddO0lQeMrd8KaZq3sJ/j9Rwyz+t6TqMCLUI9D7ZG187gV5yHai TwzWzAWg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lUwXB-000oiB-BF; Fri, 09 Apr 2021 19:11:22 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-afs@lists.infradead.org, Christoph Hellwig , Jeff Layton Subject: [PATCH v7 27/28] mm/filemap: Convert wake_up_page_bit to wake_up_folio_bit Date: Fri, 9 Apr 2021 19:51:04 +0100 Message-Id: <20210409185105.188284-28-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210409185105.188284-1-willy@infradead.org> References: <20210409185105.188284-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 22E9F80192C0 X-Stat-Signature: boy6epqqsqkecp3an3xuem365txbhoty Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617995551-658121 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: All callers have a folio, so use it directly. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig Acked-by: Jeff Layton --- mm/filemap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 8f07e21a8f29..dfdc04130c5b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1121,14 +1121,14 @@ static int wake_page_function(wait_queue_entry_t = *wait, unsigned mode, int sync, return (flags & WQ_FLAG_EXCLUSIVE) !=3D 0; } =20 -static void wake_up_page_bit(struct page *page, int bit_nr) +static void wake_up_folio_bit(struct folio *folio, int bit_nr) { - wait_queue_head_t *q =3D page_waitqueue(page); + wait_queue_head_t *q =3D page_waitqueue(&folio->page); struct wait_page_key key; unsigned long flags; wait_queue_entry_t bookmark; =20 - key.page =3D page; + key.page =3D &folio->page; key.bit_nr =3D bit_nr; key.page_match =3D 0; =20 @@ -1163,7 +1163,7 @@ static void wake_up_page_bit(struct page *page, int= bit_nr) * page waiters. */ if (!waitqueue_active(q) || !key.page_match) { - ClearPageWaiters(page); + ClearFolioWaiters(folio); /* * It's possible to miss clearing Waiters here, when we woke * our page waiters, but the hashed waitqueue has waiters for @@ -1179,7 +1179,7 @@ static void wake_up_folio(struct folio *folio, int = bit) { if (!FolioWaiters(folio)) return; - wake_up_page_bit(&folio->page, bit); + wake_up_folio_bit(folio, bit); } =20 /* @@ -1444,7 +1444,7 @@ void unlock_folio(struct folio *folio) BUILD_BUG_ON(PG_waiters !=3D 7); VM_BUG_ON_FOLIO(!FolioLocked(folio), folio); if (clear_bit_unlock_is_negative_byte(PG_locked, folio_flags(folio, 0))= ) - wake_up_page_bit(&folio->page, PG_locked); + wake_up_folio_bit(folio, PG_locked); } EXPORT_SYMBOL(unlock_folio); =20 @@ -1461,11 +1461,12 @@ EXPORT_SYMBOL(unlock_folio); */ void end_page_private_2(struct page *page) { - page =3D compound_head(page); - VM_BUG_ON_PAGE(!PagePrivate2(page), page); - clear_bit_unlock(PG_private_2, &page->flags); - wake_up_page_bit(page, PG_private_2); - put_page(page); + struct folio *folio =3D page_folio(page); + + VM_BUG_ON_FOLIO(!FolioPrivate2(folio), folio); + clear_bit_unlock(PG_private_2, folio_flags(folio, 0)); + wake_up_folio_bit(folio, PG_private_2); + put_folio(folio); } EXPORT_SYMBOL(end_page_private_2); =20 --=20 2.30.2