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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 179CAC30658 for ; Tue, 2 Jul 2024 17:18:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A960B6B0098; Tue, 2 Jul 2024 13:18:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A1DDD6B009D; Tue, 2 Jul 2024 13:18:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 897E36B00A0; Tue, 2 Jul 2024 13:18:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 628526B0098 for ; Tue, 2 Jul 2024 13:18:12 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0D27E803FF for ; Tue, 2 Jul 2024 17:18:12 +0000 (UTC) X-FDA: 82295470824.01.F5D4D95 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf07.hostedemail.com (Postfix) with ESMTP id D055B40014 for ; Tue, 2 Jul 2024 17:18:09 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="AVfK0B4/"; spf=pass (imf07.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719940678; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OvNOL0R1Ho31+z5+kRdeVGtZSVc+6xGXFrka68TWAc8=; b=qTKKUKml27RSsw99PhqiWQpznpSfAHZxNx1UU5xqzt0aHVWlfb/yfWInv2Ug2aK2k0DdCf dmcbtY8eNVeTXGNvE1ezGKGFvgspaO+kSiyh4DJ1Ene0ihf3D/k93gQGwRkMWzlcQBU4n1 JD8QumacPtHlmpVZAqIhe53O2qX3boE= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="AVfK0B4/"; spf=pass (imf07.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719940678; a=rsa-sha256; cv=none; b=jXdxo35WXNT+sm7ECd5fnYizs1AzZReSEYoIVejCn6Cp6obbvWQ7AMYNKyyfGRmho3JXXy XN/C2JvggixSw7sTUh8sUksOY0XmWR6Dr7lI2Sa9pOfhoqTmqL1SNa2zmnhpLKHZn6o2hI z1bXU6R0NXo9dIsrxDb6XlzRMGztWb8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6629DCE0B2E; Tue, 2 Jul 2024 17:18:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F146AC116B1; Tue, 2 Jul 2024 17:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719940685; bh=EON+gqEufkTPjkcJvb2LKu94Uj13qfooeC/bdqwFgY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AVfK0B4/VLfszVK2GVrRYavPxtQL8FYWFuozactC36JVOt9Ah+d36yWpl99QIPfCd cx0SWA0+iF2gSb8/PM4U5fg/ElEWxYF1uhcc/bi4iXMnnkeal8a6L1ZR4l7iZ79zFc IfapPgM1qdYDbI7XXJoCGNY0+KEFCNj8umtgaqo0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Matthew Wilcox , Jeff Layton , netfs@lists.linux.dev, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christian Brauner , Sasha Levin Subject: [PATCH 6.9 222/222] netfs: Fix netfs_page_mkwrite() to flush conflicting data, not wait Date: Tue, 2 Jul 2024 19:04:20 +0200 Message-ID: <20240702170252.473065522@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170243.963426416@linuxfoundation.org> References: <20240702170243.963426416@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: D055B40014 X-Stat-Signature: 6c3y4kezq7jki6npfhop54fd5oe9b5pb X-Rspam-User: X-HE-Tag: 1719940689-40188 X-HE-Meta: U2FsdGVkX1+GhT+ddRjIqbgkEj2uhDTG4NGpdpCdhd2AzmorTnDphNYmKvAojlF1iApUB7cVEcwpNppTevSLjPh9+OTb0Vd4sL/A+RUMyiM0kiWRjKJdaPiw4Diq69M6xrk6N8rQBWdhS7m1lXYRbNI0PSdIXKxaF43Lm0RRV++LLxnpl0UIJXMMRTnbetNRYmphjWAXZCUTi1U+0YRBmKVS9RHhBJoR3sJcy94yUCJn2kXLTLKDVCuGvx957B/HDvkIjjvCQ3nQOcDmr7VI6JYFd/CavS92dQDIH/b5mdrB8Y8SrmJK2+UfSXZubZlehmJeXtSQS/nf3m784TlOGzOVPG7NzPuEcvEVrnm4QcUuNl8GAK7BNLmUelpoEtE+8Ho/EXcdYi2ChUhtyxJBdmTEfAKcTINuNiD6YfQWVF/cmXkVZWca3HISc6zGWR7miT7ED2nK6P1XkqcnuGJD9yiNPijtLv7Rcmr4MsadU4ajlIUuMbX/SyGIcpRwUTMbbXC5tRKoZOcdzDuvAvswTWs9pvR5PYOgtF5BNI6hIbBsUFmmUNbr5whJ6qTHty4Nbpd6uFjzfkLvRLRrYrVhmV1xPi3S2n1Yj+mulU51iusQTF2MpKGIjn4UcXqYU2mE1Ao9VTIpn81M6yR6nM0fqccMf51d4cRM9o7OUKGw0u7U/vdoavIDDufKz+j6gsbmilDuL25OSbSNjVL8n278t9xdbgprDGeb9Liek7/QBmCpfYf13lZwW9J6/FCAGVZCOSK9wFEd/dsl6WyGIlZ9HjypXUWR0O8+J4ZB+MVvP7E8AZOhCoqcwqhEBZw9jkmaUU0369hKwW17w8VWBn04s8z5zeBupMYESMGeXPOWuoZA1CsczVRVk26x9HCmI7K43tC4XYvyjPahXdrZy2+6J/pUvKV+2hTq9+NVj66D42zK6cxzDuKZp9deEfET1Pc4aD81hNc8aQfqkZoeKQ8 7u0B1N+n /svf/I9x4bQ02ERQaGGP0ozD3fwZH+Xls473ZDeF9CkrPR2jvo3uar9UXbC+G5sAeDozZKeWE/kbv7SJWgXlzFkCc5Kw5YajI0+iO6fCSYcskJVDDXkNjv4wa72jeWtu4nPBptKi0xdo1s3vgn57fMaEzAoV0i+HcvZWnNehfT8TLerupJU5zRseIx0H7e/8HKApnhWBPkzGW5EQnMlI4Q+sDixV1PwtYLkaEs9LpbMBOnE/A+yGK2b0VpeMpvN3oKMJAivJ6ibowGPtabhSOh+zfJBaYyrO1veevyyCg8IDuVuQlLV7EyqNHPCVGmXEshDfxejuJOjGqacdAI8YYAxho7xeTfbL6i5J6Dl1+6rwomYRL/71HfluXOB9ByaN0PDymcQlWi8DoC8tMOHh1UCQjLpPh6p4+D8zwe2OtodvNqimC1KjiulR2t/lju5UyrCYfoU948oJp6u5cmqfK8qGnIT2v3Uvn+MZgF9a7L9qSjhsdhsMCTTE0tPKjo/puciBl 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: List-Subscribe: List-Unsubscribe: 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 9d66154f73b7c7007c3be1113dfb50b99b791f8f ] Fix netfs_page_mkwrite() to use filemap_fdatawrite_range(), not filemap_fdatawait_range() to flush conflicting data. Fixes: 102a7e2c598c ("netfs: Allow buffered shared-writeable mmap through netfs_page_mkwrite()") Signed-off-by: David Howells Link: https://lore.kernel.org/r/614300.1719228243@warthog.procyon.org.uk cc: Matthew Wilcox cc: Jeff Layton cc: netfs@lists.linux.dev cc: v9fs@lists.linux.dev cc: linux-afs@lists.infradead.org cc: linux-cifs@vger.kernel.org cc: linux-mm@kvack.org cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/netfs/buffered_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index 72e4fa233c526..d2ce0849bb53d 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -535,9 +535,9 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr if (netfs_folio_group(folio) != netfs_group) { folio_unlock(folio); - err = filemap_fdatawait_range(mapping, - folio_pos(folio), - folio_pos(folio) + folio_size(folio)); + err = filemap_fdatawrite_range(mapping, + folio_pos(folio), + folio_pos(folio) + folio_size(folio)); switch (err) { case 0: ret = VM_FAULT_RETRY; -- 2.43.0