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=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 5DA93C55179 for ; Mon, 2 Nov 2020 18:43:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CEB5B223BD for ; Mon, 2 Nov 2020 18:43:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="epiHgR/H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEB5B223BD 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 DD8366B0071; Mon, 2 Nov 2020 13:43:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E9B46B007B; Mon, 2 Nov 2020 13:43:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 383AE6B0070; Mon, 2 Nov 2020 13:43:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0212.hostedemail.com [216.40.44.212]) by kanga.kvack.org (Postfix) with ESMTP id 0063F6B0072 for ; Mon, 2 Nov 2020 13:43:24 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 97DE582499A8 for ; Mon, 2 Nov 2020 18:43:24 +0000 (UTC) X-FDA: 77440351128.30.tree67_2100798272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 55317180B3AA7 for ; Mon, 2 Nov 2020 18:43:24 +0000 (UTC) X-HE-Tag: tree67_2100798272b2 X-Filterd-Recvd-Size: 3942 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 18:43:23 +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=5XmDfsPihqOhYwqzIA37D9dhvkyh36adUczq+IZmr9Y=; b=epiHgR/H4u8NML86wxA83kdrTT rpPliY6SDYRT/j7chybGWvl0zPcb4MM+5TGVgt/10yYyPQ2glczZgMRzSMtkw9wfAhn3jPf9z+aUf KDtyN0aH6Y4nWmEVFxWGUV8en0H4LPiIL7acEfbK8d9HRXXQeik4MayNR4U0VFipL2vtDFhvpVA3r geBZgQ/GuLIvdHOQgWM8V9byLGLMgQX2gdZJe7ZdqfiLxuo29KgFu4+rGhdQTcbvBVP9hG6mGGddu iRua/eagnO9lQM4GWOf83TT5NB/phWcU5LvtiiEtH/G03+5mWzrYF1gReqQTFfl9WAQJFy/W/17Ql Py6cAhJA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZenX-0006mY-Qi; Mon, 02 Nov 2020 18:43:19 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hch@lst.de, kent.overstreet@gmail.com Subject: [PATCH 05/17] mm/filemap: Inline __wait_on_page_locked_async into caller Date: Mon, 2 Nov 2020 18:43:00 +0000 Message-Id: <20201102184312.25926-6-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201102184312.25926-1-willy@infradead.org> References: <20201102184312.25926-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: The previous patch removed wait_on_page_locked_async(), so inline __wait_on_page_locked_async into __lock_page_async(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 53 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 550e023abb52..7a4101ceb106 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1317,36 +1317,6 @@ int wait_on_page_bit_killable(struct page *page, i= nt bit_nr) } EXPORT_SYMBOL(wait_on_page_bit_killable); =20 -static int __wait_on_page_locked_async(struct page *page, - struct wait_page_queue *wait, bool set) -{ - struct wait_queue_head *q =3D page_waitqueue(page); - int ret =3D 0; - - wait->page =3D page; - wait->bit_nr =3D PG_locked; - - spin_lock_irq(&q->lock); - __add_wait_queue_entry_tail(q, &wait->wait); - SetPageWaiters(page); - if (set) - ret =3D !trylock_page(page); - else - ret =3D PageLocked(page); - /* - * If we were succesful now, we know we're still on the - * waitqueue as we're still under the lock. This means it's - * safe to remove and return success, we know the callback - * isn't going to trigger. - */ - if (!ret) - __remove_wait_queue(q, &wait->wait); - else - ret =3D -EIOCBQUEUED; - spin_unlock_irq(&q->lock); - return ret; -} - /** * put_and_wait_on_page_locked - Drop a reference and wait for it to be = unlocked * @page: The page to wait for. @@ -1514,7 +1484,28 @@ EXPORT_SYMBOL_GPL(__lock_page_killable); =20 int __lock_page_async(struct page *page, struct wait_page_queue *wait) { - return __wait_on_page_locked_async(page, wait, true); + struct wait_queue_head *q =3D page_waitqueue(page); + int ret =3D 0; + + wait->page =3D page; + wait->bit_nr =3D PG_locked; + + spin_lock_irq(&q->lock); + __add_wait_queue_entry_tail(q, &wait->wait); + SetPageWaiters(page); + ret =3D !trylock_page(page); + /* + * If we were succesful now, we know we're still on the + * waitqueue as we're still under the lock. This means it's + * safe to remove and return success, we know the callback + * isn't going to trigger. + */ + if (!ret) + __remove_wait_queue(q, &wait->wait); + else + ret =3D -EIOCBQUEUED; + spin_unlock_irq(&q->lock); + return ret; } =20 /* --=20 2.28.0