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 A0773C433E0 for ; Thu, 28 Jan 2021 07:05:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4A86464DCE for ; Thu, 28 Jan 2021 07:05:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A86464DCE 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 3B35E6B008A; Thu, 28 Jan 2021 02:04:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 319D86B008C; Thu, 28 Jan 2021 02:04:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1460F8D0001; Thu, 28 Jan 2021 02:04:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0091.hostedemail.com [216.40.44.91]) by kanga.kvack.org (Postfix) with ESMTP id E49456B008A for ; Thu, 28 Jan 2021 02:04:52 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B49A4180AD830 for ; Thu, 28 Jan 2021 07:04:52 +0000 (UTC) X-FDA: 77754296424.18.bun47_0a14c6b2759d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id A1995100ED0F9 for ; Thu, 28 Jan 2021 07:04:52 +0000 (UTC) X-HE-Tag: bun47_0a14c6b2759d X-Filterd-Recvd-Size: 3324 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Jan 2021 07:04:52 +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=WrcE9wDLGwcgqmg9jOBMPtFnKP9h0xvtDeRBx/lUkUM=; b=R4a+DNuRMUROgC5bZJpYYWEIKq cG+V8j2Im9pzS9xlxg7vBc9Pq2AnAjWq7DNKFQbCwfk9M5unx0e5ExjyMnQUDHmLhQWO1FcqUVAu0 tSeIo4KLmO2eS51f28D2jIEsCTr1RA+uEMWeDhE/S/yItfs0luLTHRw32i+CPdTvtMNfMzGNRrJof M8UGoJHkk4qLcKzC5ZOZ1ol7BXk32+zn6rSXCsHaYAT5qeKbo9tl3OwFUGi0Px/FNYfpodwHXEJhs Oh2JGB90MNWCasKj6cvLUJT2e0ejCsxAniSVlprgeN42swk0wSwY4Sr9VGJzUSGh26IcNS8LwA8lB YLgKDZCw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51MF-00848W-Mn; Thu, 28 Jan 2021 07:04:48 +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 v3 20/25] mm: Add wait_on_folio_locked & wait_on_folio_locked_killable Date: Thu, 28 Jan 2021 07:03:59 +0000 Message-Id: <20210128070404.1922318-21-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128070404.1922318-1-willy@infradead.org> References: <20210128070404.1922318-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: Turn wait_on_page_locked() and wait_on_page_locked_killable() into wrappers. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 757e437e7f09..546565a7907c 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -730,16 +730,14 @@ extern int wait_on_folio_bit_killable(struct folio = *folio, int bit_nr); * ie with increased "page->count" so that the page won't * go away during the wait.. */ -static inline void wait_on_page_locked(struct page *page) +static inline void wait_on_folio_locked(struct folio *folio) { - struct folio *folio =3D page_folio(page); if (FolioLocked(folio)) wait_on_folio_bit(folio, PG_locked); } =20 -static inline int wait_on_page_locked_killable(struct page *page) +static inline int wait_on_folio_locked_killable(struct folio *folio) { - struct folio *folio =3D page_folio(page); if (!FolioLocked(folio)) return 0; return wait_on_folio_bit_killable(folio, PG_locked); @@ -759,6 +757,16 @@ static inline void wait_on_page_fscache(struct page = *page) wait_on_folio_bit(folio, PG_fscache); } =20 +static inline void wait_on_page_locked(struct page *page) +{ + wait_on_folio_locked(page_folio(page)); +} + +static inline int wait_on_page_locked_killable(struct page *page) +{ + return wait_on_folio_locked_killable(page_folio(page)); +} + int put_and_wait_on_page_locked(struct page *page, int state); void wait_on_folio_writeback(struct folio *folio); static inline void wait_on_page_writeback(struct page *page) --=20 2.29.2