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 8F825C433E0 for ; Mon, 18 Jan 2021 17:04:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 45CFD221EB for ; Mon, 18 Jan 2021 17:04:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45CFD221EB 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 574988D0018; Mon, 18 Jan 2021 12:04:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A6486B02B1; Mon, 18 Jan 2021 12:04:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1736F8D0018; Mon, 18 Jan 2021 12:04:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0171.hostedemail.com [216.40.44.171]) by kanga.kvack.org (Postfix) with ESMTP id ADE158D001E for ; Mon, 18 Jan 2021 12:04:25 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7475A282B for ; Mon, 18 Jan 2021 17:04:25 +0000 (UTC) X-FDA: 77719519290.28.cream23_1d0f74b2754a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 01902612D for ; Mon, 18 Jan 2021 17:03:40 +0000 (UTC) X-HE-Tag: cream23_1d0f74b2754a X-Filterd-Recvd-Size: 3432 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:40 +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=2oB1J7YPMqOqaptpQQF6LuJLozA0Blu+qF50Ou3wc1Y=; b=jwWXeT6uvhvwRd/0/yr6+snhwD wLTtpIvGcY/vg7Y9pfjmp2YljT7XGF7EwuX5A78Si46+/Jr6hUnTJFuODx40dnXPoljuSyXCfaERf vq8yK/k97dYZtggpr+BtE8rzSv+jh3HZ+Peo1++KA+EnRaUnR1DK9QpTDcqV3kXSTFmz2APAbbD/M 9KTFvq2q1rji3WO5P5HbMQjI4wEoCwyyAQBNUx7PpQ3aTYZJG78lR1XWLOMv5fCuACmZmobPfXLsj +1r80vIx+6WDZT+0X0mSgr72VDaRDUDr/iitXpeLdXBJSf7XVhuSCpVk2gfiuAOs/NunXH/dYoiz5 qjg0ensQ==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l1XwC-00D7Wy-0c; Mon, 18 Jan 2021 17:03:32 +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 24/27] mm/filemap: Convert wake_up_page_bit to wake_up_folio_bit Date: Mon, 18 Jan 2021 17:01:45 +0000 Message-Id: <20210118170148.3126186-25-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: All callers have a folio, so use it directly. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 4ece44f694f6..a2d9ee6e78ae 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1089,14 +1089,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 @@ -1131,7 +1131,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 @@ -1147,7 +1147,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 /* @@ -1447,7 +1447,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))) - wake_up_page_bit(&folio->page, PG_locked); + wake_up_folio_bit(folio, PG_locked); } EXPORT_SYMBOL(unlock_folio); =20 --=20 2.29.2