From patchwork Mon Jan 18 17:01:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12027865 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 DD1FCC433DB for ; Mon, 18 Jan 2021 17:03:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8FD2822C9C for ; Mon, 18 Jan 2021 17:03:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FD2822C9C 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 19D656B020B; Mon, 18 Jan 2021 12:03:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 14E6D6B024C; Mon, 18 Jan 2021 12:03:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 064128D0018; Mon, 18 Jan 2021 12:03:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0054.hostedemail.com [216.40.44.54]) by kanga.kvack.org (Postfix) with ESMTP id E44946B020B for ; Mon, 18 Jan 2021 12:03:42 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id B05088249980 for ; Mon, 18 Jan 2021 17:03:42 +0000 (UTC) X-FDA: 77719517484.27.view06_340bd232754a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 7C8103D677 for ; Mon, 18 Jan 2021 17:03:41 +0000 (UTC) X-HE-Tag: view06_340bd232754a X-Filterd-Recvd-Size: 3138 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf36.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=Kylbs0g4ewc+jvtnrfyqm6ClOMM1NzhqiyDdrSqfr0c=; b=hc15vIjFAuuafy9VINn06pE1JT HOz8GsraikGCaeI5c1i5jbMbFus/8BfOl6qf5EiSNFP3H8vdGnwrCgr7u8x4h4IZTLMs50cYhHk1X NH9D2UoHBj3Zb5dDqfgSwvnv5cM4Zhy+c7dJhC0ue0KBxzAVC7WECDSf1OhOxHExAClXWryyvX3Mt VYjG3JPXJ+JjpjNfWhndj2D1JAr0IAIJuSStXdl95Ev0Q4elrG92TLInqEbxhGV8Lc27LdOG79k93 FRLRNKe2gqBaPD84jOrEmympzYM/yvgnC/FlhpoP6VEmsDvzVOZX+694hwcAXv/4MS6G7iztWgh4b s4tCcWNA==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l1Xw0-00D7Vn-TS; Mon, 18 Jan 2021 17:03:24 +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 22/27] mm: Add wait_on_folio_locked & wait_on_folio_locked_killable Date: Mon, 18 Jan 2021 17:01:43 +0000 Message-Id: <20210118170148.3126186-23-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 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 619bfc6ea1ff..d28b53f91275 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -729,21 +729,29 @@ 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 = page_folio(page); if (FolioLocked(folio)) wait_on_folio_bit(folio, PG_locked); } -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 = page_folio(page); if (!FolioLocked(folio)) return 0; return wait_on_folio_bit_killable(folio, PG_locked); } +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)); +} + extern void put_and_wait_on_page_locked(struct page *page); void wait_on_folio_writeback(struct folio *folio);