From patchwork Fri May 19 09:35:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13248030 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 62485C77B75 for ; Fri, 19 May 2023 09:36:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB68C28000C; Fri, 19 May 2023 05:36:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DEFBF280001; Fri, 19 May 2023 05:36:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C689728000C; Fri, 19 May 2023 05:36:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AE2AD280001 for ; Fri, 19 May 2023 05:36:23 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8F9911609FC for ; Fri, 19 May 2023 09:36:23 +0000 (UTC) X-FDA: 80806499046.13.C6DD781 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf20.hostedemail.com (Postfix) with ESMTP id EDD371C0013 for ; Fri, 19 May 2023 09:36:21 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=cWIcWF+N; dmarc=none; spf=none (imf20.hostedemail.com: domain of BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684488982; 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=lKV8h274a8dJZYXDnZBnFaYep44iQbnn3gg/wqWXLcU=; b=BuBJmBb/gHdZR2bXykfNd2z9Oi0+gwbDaRod2vV9LqL/FKWTGB+CH5QqK+DImB91RwMOjn UfHxaYq9eqeqAPgauLP/+S+xKgSxgup30UxvM3rHsqGeOGcFKVGox3E+uPlh6UwTxRZjwx 24pOMZK6LCRItbTcbtDF2nWYUek9Gjs= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=cWIcWF+N; dmarc=none; spf=none (imf20.hostedemail.com: domain of BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+aecf67361b95543ec79f+7208+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684488982; a=rsa-sha256; cv=none; b=ppd4OZwWb5bHOFo/XsPR3lVQntfAeJlJz3E+GE+I7WHvKl/AJM6aTy3NeGETGcnNm7EmqZ cwzDqjP2FKge3EQY7CVUwUHJt5YIqV5YSV+5sXZEHUDM+Y5/5x4mejFGBUBfk4tEKEGtRt 5yzSnhqCeBxfHjDONL1bn3/B3ORZG+Q= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=lKV8h274a8dJZYXDnZBnFaYep44iQbnn3gg/wqWXLcU=; b=cWIcWF+NCJsR16lt+GN3SyqYi8 20m98Sg1zXHAv7DP2DoTSsINVBJLT/jPU8582VtWjlVAlPAxQNKVTFaC0YOnpEd5FvRMnBLi4ey94 K4WsXk4K1iXMjE0WTmxaYPPuCk8QMzpH/S5exdIPqIWUyCVLjzR3cBZl2UWcus5acmbfLvwlunIjm 4ycE2BJo+CC540gWRfo2M+hpyeOMIoCToQspTNQ3U/ipx7csq77R4XMThx+m4QCcDyjZBfA7VJFoS hKoo+WYpC8HvPYhP5WamSeG2WcUggfS4/afnmf7Abg1NQrcteg0tvokFZlTlL+/0VmwC02dijjfgF XYj4OTgA==; Received: from [2001:4bb8:188:3dd5:e8d0:68bb:e5be:210a] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pzwWm-00Fjl7-2x; Fri, 19 May 2023 09:36:01 +0000 From: Christoph Hellwig To: Matthew Wilcox Cc: Jens Axboe , Xiubo Li , Ilya Dryomov , Alexander Viro , Christian Brauner , "Theodore Ts'o" , Jaegeuk Kim , Chao Yu , Miklos Szeredi , Andreas Gruenbacher , "Darrick J. Wong" , Trond Myklebust , Anna Schumaker , Damien Le Moal , Andrew Morton , linux-block@vger.kernel.org, ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net (open list:F2FS FILE SYSTEM), cluster-devel@redhat.com, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 13/13] fuse: use direct_write_fallback Date: Fri, 19 May 2023 11:35:21 +0200 Message-Id: <20230519093521.133226-14-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230519093521.133226-1-hch@lst.de> References: <20230519093521.133226-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspam-User: X-Stat-Signature: dkhxc4o1rqe4qm6duyyu4m5o58guobj5 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: EDD371C0013 X-HE-Tag: 1684488981-525667 X-HE-Meta: U2FsdGVkX1+RuYBueTHNIrs5MahYbUP1Nov8KJLGqPqOsN9/b7ptYT/MjgMatwRd3Muix03i9zzMxsRnWl9zJbFt2+jDZ6lVGBAPE6RzF58U+p0UXqDcHIOpMMFGYAkp0SMcm5t3fwR8QHmsh4jyY3j0v4TwodQLpinopbdBPJuAkqXQ6toApHTST9VrFKHp4rvA8hJIIPfNLiptzYHVH/A9Ddxjlm2pXn7k2XQXLhFTht4H8exIdnZrSQstf3bBErFt0IlgLztHzgdFi70PFOMYG9dNwn8pCrJgjhcwKUqg/Ff7mBX0byGhAPdkpHM7YZw0RKWAvrWvghFmUaqugafaN+nnYO02EjMlQuK+HbxmgSvCarFvEtpzCBpYN7FFY2BMfjcqnyoLfCA3yhBpm7XsrBNvB800JjsqB/rnMnek80dk97wo3ckwWo6Mx3ccBhmp6EjgWRP9vTWGnQpypiZigTJ8jwWe7Le95IpX5RCoDOgyPqKZ00JhnqdVVzeAkHS/zq/0BPDLWKFAL2Rm4F1BjTNl+WrxH/SdS5xzXOrwkfaBIMm6e9CTAHmxfzeGVYWdazAPc23upUdDXrYFliDdASB6RIr8IOa20f1Wysl53tFYCoBNkzKs0J6Ety9gCbxeUb7rK6Eyfe2oTQqB9TptmA/AhyP/eDpTGBranrzHT7Mj9mT1PUpWlslpahGwLuBf4ynYEhQF/aq0YnvXOGxFwVrty2rjL5iJeOiVC10oNMS7ooDSqLPaRDnE7gyKncL79sTiDeDCT4T4rjRIAtYuLumVqhw4JEyGLcCPjQeO+5drVWLYD6nn7fxhBzz8fsKmgbDZ1tXEtGKYsWYlFPxAs7iGAW9cExQfoVNoObaytZ2Jk4CK3FBERpcjNpWAuWpskLH3fLap/wsadx+fxB+Qqu7OY3Dba3DnyLy4Bd7wgsHqzikLg6/pTGMn4Cm0J7KM3zYwQlK++nxLv5Z nmVZ5L3L bClVWlLfXvzweObGneKs3vZgnk+vBPcyMQzZclJJTArnyGKSP+F1uefvU3FKzcycyss5boREeMZtNjRiTPaqlTMgE4/SauCgVbd8dcXWL4WnguRqtYvFowq0Z+raiwP7PBBMqJbOT52rhuGv3FBeNexlRwzEkK6Drp812llv4+HmU2j3PiAzmZ4WpowoIpDc/MzxP61uAPHKd503jfKTxFLenOhhwCShP2S75cE0i3jsu0grfGktAX0+/j+T32XIpjFHuVj7dEKn0t/e7tNpl2Vq6EgyEnggKlK3ykczBzL1V4AHVuTLaHVz5DkCc4oXrjgjARviz3CMuymsostwDsKNVTVH1B/5EA6EfBvMMnBAp5FAVTFFK69jgeHQBKBrrODT9j8RKDvsi+hj+1+wd82zpfjoHssRczZNp5FluuYgIBARGAX75m3zaDX3lzBtf+9RJatNTNOohz+O2vCHMttx4RA== 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: Use the generic direct_write_fallback helper instead of duplicating the logic. Signed-off-by: Christoph Hellwig Reviewed-by: Damien Le Moal --- fs/fuse/file.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 5f7b58798f99fc..02ab446ab57f1f 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1340,11 +1340,9 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) struct file *file = iocb->ki_filp; struct address_space *mapping = file->f_mapping; ssize_t written = 0; - ssize_t written_buffered = 0; struct inode *inode = mapping->host; ssize_t err; struct fuse_conn *fc = get_fuse_conn(inode); - loff_t endbyte = 0; if (fc->writeback_cache) { /* Update size (EOF optimization) and mode (SUID clearing) */ @@ -1382,28 +1380,9 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) if (iocb->ki_flags & IOCB_DIRECT) { written = generic_file_direct_write(iocb, from); - if (written < 0 || !iov_iter_count(from)) - goto out; - - written_buffered = fuse_perform_write(iocb, from); - if (written_buffered < 0) { - err = written_buffered; - goto out; - } - endbyte = iocb->ki_pos + written_buffered - 1; - - err = filemap_write_and_wait_range(file->f_mapping, - iocb->ki_pos, - endbyte); - if (err) - goto out; - - invalidate_mapping_pages(file->f_mapping, - iocb->ki_pos >> PAGE_SHIFT, - endbyte >> PAGE_SHIFT); - - written += written_buffered; - iocb->ki_pos += written_buffered; + if (written >= 0 && iov_iter_count(from)) + written = direct_write_fallback(iocb, from, written, + fuse_perform_write(iocb, from)); } else { written = fuse_perform_write(iocb, from); }