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 52D4DC43467 for ; Fri, 16 Oct 2020 16:04:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AD3A620874 for ; Fri, 16 Oct 2020 16:04:52 +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="GgPRh7i4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD3A620874 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 2ADEF94000C; Fri, 16 Oct 2020 12:04:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21117940007; Fri, 16 Oct 2020 12:04:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FE4B94000C; Fri, 16 Oct 2020 12:04:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 70DAC940007 for ; Fri, 16 Oct 2020 12:04:51 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 57E14181AEF1E for ; Fri, 16 Oct 2020 16:04:50 +0000 (UTC) X-FDA: 77378261940.07.flesh33_0d04bf72721e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 3CDD71803F9A8 for ; Fri, 16 Oct 2020 16:04:50 +0000 (UTC) X-HE-Tag: flesh33_0d04bf72721e X-Filterd-Recvd-Size: 2605 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Fri, 16 Oct 2020 16:04:49 +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=HQZhweg8a+1Qpo+qFNQoqVI2WIjKy37atq+XWcCiXOA=; b=GgPRh7i4pcxQzH2s2TIqMTVaNA p7aJ3YoseJCB9AZRZSNNwE6+93TVYg7niLGp7MOGNw7tVp7QXYl3/bZbGLqd29A/AEKtoaBID8wpJ LHalqyGCk9103wZRfVL+OIWJ1eUTYlYwY0EMyFwYYtaltDcBio2GrepIGNVAacjTKvoTQ9zlqw0hb k+q6/8I0srS9JtJ+YAWcbZ2UJtJyyLGQwqshMv4U+hhREF/UA9qE7qXWjTx83iJ++Vddi4RA5Bj08 P9sGKKuW0ymn9cH1niWT8JY5NLqAGc6FLByWlYhuePbVcnIRu3A3PzLwRSMI+Xmdd/1pJiIUoAvaM ZWjoZHhA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTSDm-0004sX-3v; Fri, 16 Oct 2020 16:04:46 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Dominique Martinet Subject: [PATCH v3 05/18] 9p: Tell the VFS that readpage was synchronous Date: Fri, 16 Oct 2020 17:04:30 +0100 Message-Id: <20201016160443.18685-6-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201016160443.18685-1-willy@infradead.org> References: <20201016160443.18685-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 9p readpage implementation was already synchronous, so use AOP_UPDATED_PAGE to avoid cycling the page lock. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Dominique Martinet --- fs/9p/vfs_addr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index cce9ace651a2..506ca0ba2ec7 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -65,7 +65,7 @@ static int v9fs_fid_readpage(void *data, struct page *p= age) SetPageUptodate(page); =20 v9fs_readpage_to_fscache(inode, page); - retval =3D 0; + return AOP_UPDATED_PAGE; =20 done: unlock_page(page); @@ -280,6 +280,10 @@ static int v9fs_write_begin(struct file *filp, struc= t address_space *mapping, goto out; =20 retval =3D v9fs_fid_readpage(v9inode->writeback_fid, page); + if (retval =3D=3D AOP_UPDATED_PAGE) { + retval =3D 0; + goto out; + } put_page(page); if (!retval) goto start; --=20 2.28.0