From patchwork Tue Feb 4 22:47:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960031 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 6871AC02193 for ; Tue, 4 Feb 2025 22:48:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED7706B0088; Tue, 4 Feb 2025 17:48:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E61446B0089; Tue, 4 Feb 2025 17:48:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB2C76B008A; Tue, 4 Feb 2025 17:48:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AE2CA6B0088 for ; Tue, 4 Feb 2025 17:48:48 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5C22F160113 for ; Tue, 4 Feb 2025 22:48:48 +0000 (UTC) X-FDA: 83083753536.06.133A422 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) by imf25.hostedemail.com (Postfix) with ESMTP id 57FD9A000C for ; Tue, 4 Feb 2025 22:48:45 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=I4C2yu11; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709325; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9nROz+ZU1a5sA3Z/7oGyOeNO8z4rOU+FFR+QfAhYlhE=; b=J6k0E6nV7wgF0phL9CJ2eElzkwhjMMWim1dZvV7oGJ8TECX63kRGrB/h1+KZCTORlp0cCx 0KRn2j9zhT7ORynorgz4YtMQ8Z3bSWKiz2tpx3OpUdWUMb7l5W3tZxE82aManBbpRHafTJ DOI8izozRmhitMBeTJDskW3nhx6d/VM= ARC-Authentication-Results: i=2; imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=I4C2yu11; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709325; a=rsa-sha256; cv=pass; b=tEehMILNqhRvslQVQPQKY/C6ZCX3w11hdbKDY1JAE5Fx19fja6n3DK5TYWo+3HOqM3n3VX HbsWCBHri5F4i+VIg+4wAilq41KIWIPXz2YN1ZrTmfIY1tmHyHcJWF1XZM4NTTyyeevXpx 979bWPqwYoxkLhsuT4HZHD5Jx61IMTs= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JEeXGCxQoDhqAZWH6ZO3LFFWKOGKXfG47pHXke2JvIVxuLzRSMwpRznRh9q0ELcJ0w1/hQDfgJEPbhemBiHrTX2EPRYxXzsZLeQlDng5WZmA+Da5vC190w9woxAwKe1jnMv0HLdWj+MH54AEC2TpyB2SvqI5dx+YNgnEvnXtBSZjGykLp7pS1dx4gu+ZqTB63w+tZXaOooNBpG+iCbqgTGJfUH62d4CzRlVyUWbcrqbfOh6JxT0wIm0Sx8lRsD/S1bZyR4xBcEF5Jz86EDOvvbEVN2tVnBPGkgh3QxBEdzrcfaKNE2mznx5nUS251TkqVQ3HaO6tQLpknDsmGZQ9zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9nROz+ZU1a5sA3Z/7oGyOeNO8z4rOU+FFR+QfAhYlhE=; b=urHyK8dAl9HviYCpnj9DUuoSpZQ9c+dI4MVVwVZceOI6KZTaS0EfRoLAk2hitM17iQdurGTRAdEfA/GBtby3k/sUGsVbY2ydZnE8TtueWMeVDlBX0/q+v1Z7C4VP0ntXEnn+B0lvpjPVfdA3+hr1OtbMv72YFBFlBPdZGrSr8FsDwG4SM6ctOr1vjaJbhHpyy9lLAqIGDKxGzo58a1C6bvQLWMK9Q6a+60F0xlEsFrQ7TxF/18S5w1mEJmYlw7nsZVCaf3QKBaGFzjHgAvjAizXIjStKe67OFgPwm2QyrRmITFLQ1Tf834KPiEpa3DUr+HYUeacaw5h8ULdzdIOpew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9nROz+ZU1a5sA3Z/7oGyOeNO8z4rOU+FFR+QfAhYlhE=; b=I4C2yu11QKuxQWX2BOJnZ2dHaUNoCNOWqkG3xLYQ8YkVJHDbgp+7ehOKsbVlbBzfiZp98eph931HS3lOD/VHjynI+7UQKc/IXd2VZvqO7koUNlQjPYJTGwD/f0TmcZH8tPyL4uSmjzQFl/5mpuZBLIeYvWbvn38xwXMJy33zxeVz09tENqB5KQnwJ9GDTbwGv3IJcvTV3Exv+ZK/bKy0sHaaxLFmMOHW7ZaTZh7rfGHjuVoIHQxkK291NXeaPJhpR/HCQ8yHRIikKTnqyG+R5PaLRJEEIIL3QqSUrBOAlGL9FlCazjre5ibdeqDUwjCKgapeuHtRv1B5hMCPfaxxww== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:48:41 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:48:41 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev, Vivek Goyal Subject: [PATCH v7 01/20] fuse: Fix dax truncate/punch_hole fault path Date: Wed, 5 Feb 2025 09:47:58 +1100 Message-ID: <8aa3a20b072f60344e1d7e9b77a95aaa4b6dfceb.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0149.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:205::13) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 521e4fc6-0596-4f8b-b002-08dd456e1246 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: d7hsMRvoa3b9JPINSyKfeYMoDTgLnZEmlCFSiH/2LslWTEwNh8c14lrcmORVDqdMVDm1Nkp/vAGoJ4bteNP1vkRqvQTxM9VGqNAJCcrgvn5M3QfzhevWl6uRFtraS5zMdUAC5pTac3O4Xlvd/PCLUbjB/7X6V4OaJnI9LOVQ+3QWUn4yR5fn3p+S/COdKueCI/1K+7zdj4LA/TbE4tuj7wjA3aj5wxoe6BCsM1B0OguiLKru6UM/co05yyjKFTUlzehuFv2tWU+6/Obfjkn07CMfKzKLnTV5kBBsefQ9l1zEBg/2xvm9tZUL8T7uVbbtLsezm5BRrOBtRnqUwOPURy9elAXaEVKAEMp+vb4RDAwfUQ98fcSuaCNuUVYhqrMkkqR3azS4ZiJZJfLrV5898264rKJo4xUBLLLWXgbyWeI//rzxBiJnUNz8Xpjw3lGaG0l4pC5cF5EHkqF95Jv6BUZSRFcYXccVo34u2deoN3dQ1DCcxFKdQH7cr+uWnUbT9utHCCMlHndD7Z5i8ffetD4SB7LjECnh13yvUVQnm0NbbyEGplXrzSWvEMOVCxQe1oI5YP9RsHqBYyrGIBvQ+UUVf+tifbev8SwCUX4gDrN0Jt3SpcDY5+HIPA8XP90uKPeOAHNYo0UWTDmF7yw3MuIlVBS7neIBKa51eLJZzgvUx5MaMXM3ZG2fAaEUH1CBkmxkOSkJXPsnCTNRscbfsw4gshhIgsEMgagjgPg2mB9iKv9q9IooIuRB3TRejNLVWUFwJ4fVxY/stBJaBaEOiTr+AHIoxHiJqGzGgfFpJu/uRkUWaH5gnbjtsr4JoUJjOmm0tY7NW1QFcDMoR3EBxUPY6xdGhuyfwxV1Wz5VXEhXLKG2vHYXVsY4SmcMQt1s8d7+n0KF13miZcNKzekShF8gCaBErmtmeC5R6EbgDyK335FNibSaCvbDF8MrBh2xmvs55RiTnDbrobKjswhOOZdooN6vXilAtB6nFGJ28W0Knfzv1jJ565LSXdtclwzrjaNLz2f0grWRg2gGssAvKyur/i03CpSh2raW3hr8XJzuIO4nl6lFgER/OoCID3tQ68U4qWyqI9BFc3AV/waDy2GA8tsXorbkcum79op96kuiNT3r6EJ6Jxk8tOYhW8JDZeQslzZv61Cgb4lNT5uRIEeyUAo50+FEXoyVSd1g68XujSDzngAJayhn833M9C0FEIRaildfsCaM9BsuewwbW4fx1heO+XqxSFwlEZTijYULU7uT8UTGjv9yXwZNnqXZSACzEppP+ea59ozXHTfL7Q/7556QrFASr4T7CMxrmMqA2/zgU2t6zUzMv0iQPyI2RqOPUfggeMgT+E4RO3+TD4z4LdSUkPjCB1lNcTQHVE0nS6ZH9UkNtPDiTeF06rOG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AYK5LzGbZtHy34PzYKIgpSdhz1eaWHoqd8fP21lBt2TvGC+gk6rPfArvYymCM/Nn76tAs8X1JgpdidkCG3hWF/SfvGMgzA7fivs1Vin5OruJ05zoi1jQxh5BbKdPxq3u0bE1c4+KQezW72VP88LZqYTblZn/T27xm+kZlVKOfTWRaQxS0WGkIGGzF/aqGY2OidIMCcLuB0X2yaC1+D1f/Y4dGIu38R0WguGTR2PF+vrJZNMVUzQZScwYU6Dy8NxP6BjmdYj2ACx4dg6qWJ/49l2BrHY95GeHpwMze7rI9cNtSVCrTc1723hPgKp61dBZ5mXYabCKW0kSpehsPTzurD6rG/U3GJBLEYfVpyOP3z55j8cZB0d6TDo5nwekc5S2KlfO1qVlU3NFqxPJzFPBOgP8TbMYizcxysqR/VzCRXTiwqqJ66F/6FNX/f+4NNHPr+A9XQwLNLY0ZJMJCX3R0MVw14S+miCGLJNdRFwrhGLLkwep8J9U59mwqfOzuH4RxTZyQn3qA+qeyz0MTXOnNOmZLsBepOvAzXBgb3UFdeIz1jc2+uHEV/qIKmLfCsOqLn2X/GSxsp3iaBdQWj2T4IEw0Xs9fkPu/bgBjKlRzV6Aa0YBZFfdFh4yFDB55YPkr8lzIn9tiWpPkWIPhaJ+4OyIPDI7UsOve0tUAcq2tTZZ8E1lNOxGYdukGEe+OUhpLRGbzmpF7J8ZJkEV7sXYxdO3nEMxlExNu6DTl3ye/EpR923Vvri7QEJ6zY8NFcXHuiqepAOUkM9zAVdlym2Ad3AThqm+zNJQbLOpUGfqr5LLM7mF6+3nXtECtn9lVr9BsmMnWbY0b8NpXapBssq7yvv/tlTlTcPP9Cqhlh4HCq3ll4cKt7Pw30GtCv5//hH48csWmC0xkF+GpY13HnvTQtCp62kX0V7KRH9Tb2Wwgt765pD8fmJiEMGbafSIV/WugoIJ40Yf9/60SD5cAwlz10+Q7TivpNjh9IoXOWtrV2fxoPSNm46fEvRT1iKbm4CXlR4rDZMbsI+A+eR3wtnQWEO84ufKoCDfg0TR99VkCkTNqAqPfWMpMpywszPIuRLkWo46FkS9K5ctoYFpWG/MOfvO1FR4NMulHpmqLd6hpTH5I+FV9zAR2z3AyTicX/bvqYftqLyfpFPCi26asT5DT5v2E1W/nXq3bxbMhKNq/0PCaQVCOd4eETR/0TbRHPhSGx0cNZRPup+b8Qbd+mN8lA28vEB89gIlcvm2tK1MmgBetmnnYmMsRUpkA1lDeyba99CgX7vnxoYxgsQ2qUK453s61qu1rFLHLxINVF/WEss8Hvm9fXI2ebOylrkM94JEtsJkDYehX7jk69AYDqriacrw1K8IgcJOUFMOJX9MWaYjYXXQcgo7UgVUX8W++S3EWnTwTclEsLHkMGCBRWA4i/YgPsjuNWn04uOj53B4oX1zeGB4Q7THmYJwTysQy09YqMMP5IGexsbT9DgvqDEJ2ZnFuP8uZVWylbaYiZOj2V7CJTEzFu/ul1BZJKABnmQ1K66hbzloBMcujB3BgbJ0+QGzlngoTlnYiuuVbrn6jvt2vbyMGmtKpOmEQFyak+Ss X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 521e4fc6-0596-4f8b-b002-08dd456e1246 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:48:41.5096 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tbczPBwemThEbdhuCaAl0YMMwEjsjPWe0zUs6B0x/O3Ze/2HjdO9ujtKYDT7ef2WQaNfFsBKu1TmnQkz8guAbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 57FD9A000C X-Stat-Signature: cto331u5yw4sfx5n1c4rq8cxo3fhxpue X-Rspam-User: X-HE-Tag: 1738709325-774179 X-HE-Meta: U2FsdGVkX1+mPDRCN5cquqjLByaLjABGSiUsUQeQIZHT19Rf/YVjZe/+AQ83HxMx5ujwAG/nBMAComLLQ4+aYWWxXyQtPU59EYomXLZpfNQRnStKDO9ShNnBhyVofLHODap2VKBuL+4MBLmiKA86KTU2q0iN60okX2k7Ypw43/gqaSCpATOqgGyuOL2Y1zHa8gWJTgYMqEYyLYsWRTSR8YptJcAh4Y1dFm6TC43fAzfqjCLC1hR/iv2PGa0AqQREj1sLVazNaPyiP30RpDqXPcacRt/xsASZXNksX87aBjzCpcrTS04XP/H2wD61vX0wnXRYib6jNrOH2PMEMpapr7aIiYkdFpW/1xfjxgfgQbYoPOI/IopmbkrQTjhUKP1W2dmd9DUu/PhYngwv+JYdF+03VvdUkgldVjTi7/Eb1h1AcF1PpuDp9icimeHrd33/TIyMVoejeb3Nksq8F9YBaNdDUBUYeV15PjQuXeJsaBxL9DNruYDdBKA5LZPWQ5umgj5cZPf1oMThRvhzIraJou75bybvb8lIcN7FQrFgRRohx/vW7pi/G0AKkMmJmeICR91dCu4gAR57mh/Ze0UXDhOVVjkDiH/oXWHD60T+K9atFvAXfIH8IFTSxJ+F0faRpoBE2wXUACPRrjAQqgJIQiZPXm1vInXfPZ8h30ER0MGIB7FBbZvMMspdq1BoaIU3fbWEn0ixXVPM1Gz2VxM1Z2+JCYyd0004g7xIKWXUf12NBSfkbqhsYRDqkcG9AuKBuvnJGVX52WM8eEqrpcUbJA8KgWpzOhcgKdJCcetrvTBDCkQ2xD1JZprUS/MGeWhucQ9ll/XlN5p81U4/RP7s1XgRp/X1gDRE+BtJEqSD4W160SWehsQacV/s9imML/4k/yQhpHXbWp5Si61ROYdOFSi38FlkwdhUSK1ZeUFtaFYEhbuJ1TMmojHr11dm1okTpMqBGi1YevAOlMDQo2D BYPQ4PeH Al7vk0zgOU6Wemql5sbzNsAwqckDxz7IgvpqqJUrfcjn2cOoKnNnEDI3LHwJtEHqHKHncIfn/hX60wL8aWMgMTNVuRWA0Q0F9ioO8FjznBlqLh73ElvjtECCKoPa4Vv/wx6srMFz6J/mas1+eGz+WV9vKdbdHUnK+ddg4A5cLPYpj/tanprpBWtxF/3TUCrrX59/kyjmGccTAkD46IVbOYD5G2X1MaRjfCeZu7FpR4XXZ2Hyz9fHAsQ7KEOLS802UjYDlvRngQSJJlpU8b744iDC2PbDjL9uwimnL3Cmb5TkBndxJotf5M9jQ926NjsmKBmR2RSNVIGuDnYW5n20HDQ84wd493Xs33NWc3AltlAG4XMfT34E6bmOLSZH/AU/HKqTZFjw07T299C0TUShfv1cUDSS6dEZyFCMUjiFEI59X76UGisccJneo6CLbclECxjD3ktcRNPvKLNJXyYsPC5BaBa+HZ22w/74ASefa9hjVZRMKIC3VVVo8LB/P35LpM1+b 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: FS DAX requires file systems to call into the DAX layout prior to unlinking inodes to ensure there is no ongoing DMA or other remote access to the direct mapped page. The fuse file system implements fuse_dax_break_layouts() to do this which includes a comment indicating that passing dmap_end == 0 leads to unmapping of the whole file. However this is not true - passing dmap_end == 0 will not unmap anything before dmap_start, and further more dax_layout_busy_page_range() will not scan any of the range to see if there maybe ongoing DMA access to the range. Fix this by passing -1 for dmap_end to fuse_dax_break_layouts() which will invalidate the entire file range to dax_layout_busy_page_range(). Signed-off-by: Alistair Popple Co-developed-by: Dan Williams Signed-off-by: Dan Williams Fixes: 6ae330cad6ef ("virtiofs: serialize truncate/punch_hole and dax fault path") Cc: Vivek Goyal Reviewed-by: Balbir Singh --- Changes for v6: - Original patch had a misplaced hunk due to a bad rebase. - Reworked fix based on Dan's comments. --- fs/fuse/dax.c | 1 - fs/fuse/dir.c | 2 +- fs/fuse/file.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index 0b6ee6d..b7f805d 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -682,7 +682,6 @@ static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, 0, 0, fuse_wait_dax_page(inode)); } -/* dmap_end == 0 leads to unmapping of whole file */ int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start, u64 dmap_end) { diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 198862b..6c5d441 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1940,7 +1940,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, if (FUSE_IS_DAX(inode) && is_truncate) { filemap_invalidate_lock(mapping); fault_blocked = true; - err = fuse_dax_break_layouts(inode, 0, 0); + err = fuse_dax_break_layouts(inode, 0, -1); if (err) { filemap_invalidate_unlock(mapping); return err; diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 7d92a54..dc90613 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -253,7 +253,7 @@ static int fuse_open(struct inode *inode, struct file *file) if (dax_truncate) { filemap_invalidate_lock(inode->i_mapping); - err = fuse_dax_break_layouts(inode, 0, 0); + err = fuse_dax_break_layouts(inode, 0, -1); if (err) goto out_inode_unlock; } @@ -3196,7 +3196,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, inode_lock(inode); if (block_faults) { filemap_invalidate_lock(inode->i_mapping); - err = fuse_dax_break_layouts(inode, 0, 0); + err = fuse_dax_break_layouts(inode, 0, -1); if (err) goto out; }