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 1858CC77B73 for ; Wed, 31 May 2023 09:02:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6AF568E0001; Wed, 31 May 2023 05:02:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 635FC6B0078; Wed, 31 May 2023 05:02:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B0BA8E0001; Wed, 31 May 2023 05:02:15 -0400 (EDT) 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 357566B0075 for ; Wed, 31 May 2023 05:02:15 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E50A3AE259 for ; Wed, 31 May 2023 09:02:14 +0000 (UTC) X-FDA: 80849958588.14.3388794 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by imf27.hostedemail.com (Postfix) with ESMTP id A684340010 for ; Wed, 31 May 2023 09:02:12 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=szeredi.hu header.s=google header.b=A6KOMI+e; spf=pass (imf27.hostedemail.com: domain of miklos@szeredi.hu designates 209.85.218.50 as permitted sender) smtp.mailfrom=miklos@szeredi.hu; dmarc=pass (policy=quarantine) header.from=szeredi.hu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685523733; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=82U6bUpm6YFNkGK5cbhaAjWwDgpxY2X/ujFBNt1W6jk=; b=qMA1Y9VaSnOg3iFMEmxrgRC9ThMEpb00qxzIraXldQog3rObPN1UdXcAqHeHxNqd+pzQPj iAfNnNPfdjuOHf+z3V5yvuFTT7/CNfDgmktXwt2HN9sY57PGP7DnqlVCsYzut7LcxGmXV9 OmhRZmh283w75vnQbpYEVwEgb/yU8+I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685523733; a=rsa-sha256; cv=none; b=dgMVBeOnVPYv7aWME3jKaEVyg7h5Godg0cI5mI5TSWoJBO7pjv+Z6INovFHPqwdybX6hnO sYAjyl1LCThgAh0bgl5zeZ1cR88UXzGSnsk7FTugHQ/BWsmiwb/cpYR5/ZRoT+V/CfoYyI mJJ8l/civXifmOd6HnvYsCeH7XnDdSg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=szeredi.hu header.s=google header.b=A6KOMI+e; spf=pass (imf27.hostedemail.com: domain of miklos@szeredi.hu designates 209.85.218.50 as permitted sender) smtp.mailfrom=miklos@szeredi.hu; dmarc=pass (policy=quarantine) header.from=szeredi.hu Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-973bf581759so967158366b.0 for ; Wed, 31 May 2023 02:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=szeredi.hu; s=google; t=1685523731; x=1688115731; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=82U6bUpm6YFNkGK5cbhaAjWwDgpxY2X/ujFBNt1W6jk=; b=A6KOMI+ewwQr8qcLpuyi659zu4D/Uwm4Riu4JCnMaYPF83lGbGHbPte+JTqL0ejSbq VHzPX/zoWMZKPg2ZijvaZZzouWRkcsu1Cq500nIEn8quQkOQ7DmDMJl9uUNWolomxRq+ JLd/2jXH1F0vLqowGSqxr2lrm4n1twnt6EDhw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685523731; x=1688115731; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=82U6bUpm6YFNkGK5cbhaAjWwDgpxY2X/ujFBNt1W6jk=; b=cp8BiYiPS801fkqUmEelodPMShM8ARSw+AgijJBqaBlXCe2e9dLLm6u8TgbN65bTN5 uFPX6+/M0IjsWy/OLJKCwLd2QWo5cZxH/pSZ7U9xtkbOndLVRxrtM2ityAhn/fasjATN 3t4mlD7b/8QQur5iYftEunFmGgtTIpuhrB7/KxBEgAtviXCvmMNoWy9knLc0kSvFer6l VnaGfM/PjrUwXGl9kNaLIiYhlAqFeOhlGWfXG9W8/kw997wdJ0fA3mKcf5PJ7NIWbrrm 3WfPB4oK9gMPjKJqIT+ox5wjnjGcjuAsRSbMqc7+JV5xRXBRTJdcw7yYRNQJidOLxCs2 WQHA== X-Gm-Message-State: AC+VfDxjpb5k+XjyeVsNS/eIMoxRBXoUUar/dCeFuX1IbZD87iWGfbN5 n1vPglQeTFX37NyL6NIW55nNp/0f85yXZY771ZVv4A== X-Google-Smtp-Source: ACHHUZ54ruSZ4ErYRXWiU9UTWeerJcU9a8S+taczm8RKgsna09cTe6RnnExPREASsZbWk52M7ju665X7rMMjOFwIvBg= X-Received: by 2002:a17:907:3f0d:b0:966:634d:9d84 with SMTP id hq13-20020a1709073f0d00b00966634d9d84mr5472507ejc.20.1685523730877; Wed, 31 May 2023 02:02:10 -0700 (PDT) MIME-Version: 1.0 References: <20230531075026.480237-1-hch@lst.de> <20230531075026.480237-13-hch@lst.de> In-Reply-To: <20230531075026.480237-13-hch@lst.de> From: Miklos Szeredi Date: Wed, 31 May 2023 11:01:59 +0200 Message-ID: Subject: Re: [PATCH 12/12] fuse: use direct_write_fallback To: Christoph Hellwig Cc: Matthew Wilcox , Jens Axboe , Xiubo Li , Ilya Dryomov , Alexander Viro , Christian Brauner , "Theodore Ts'o" , Jaegeuk Kim , Chao Yu , 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, cluster-devel@redhat.com, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: A684340010 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: w55aizaasybqg1jrztw9qoz7q9mtc1wc X-HE-Tag: 1685523732-13542 X-HE-Meta: U2FsdGVkX1/vfadpUs01DNYhgDRzHV4uI2baYY5bYZRcckSt16LzMTIHh34bLoEpvA9eFRmpervOTw6SPF/PY8yDmnlgbwovJqmLakWvIAIHV+jOpjtAn6ZbJy05VEJKnZdocOr1yNXmnSmw1JYnu14gvTHmEemAupxnpRQLocijXqrsDMy1kvcSwjhmcjuDRvx5BZc6dfbif3EpgvD5WLSEPykVOqX6dbUIOV+wN0mifdmPDA0II5mnmN80KhodCvswRXUlnEn9lWno1MDDqrWHO/NZDrpqVcxciHND0oOy6makobnjdffRCH2KaKf5av0xNWBWiCsFIrhQtIudT/ZFPYrM/OrjVaFbTQ32VYFqVpYwWksJDwzXJA3elBAebcDynD+RB8csdtQwY+GBsEYOIIOb3kcyDpECm5C60Ph3y6aUMWpqwOjpFneFUayZR2A8JSkvzgvKf9gRwcgrTz3Vo4crl/0kZJVj1e5kPuC424nzoNTuTMaRnXRfngOz7OXophzGpIAMIbBTwgctJJjAp3nbqtRPOvDUVJfarahX4iqgxg3HUldjMHu7+W5Oc+8YO0qopwm4+q0LTnOLM7uAOabGaspUGdC34poEoMVSKFPCLTOqqpzkc2dsMCX3BrOIbiPbOvEkmN5WZaYF/By72u81yOWPWydcVhqA+DYUTQzzGGL5RfYsAjclYPyIk6hRmLcr3bIYw/406CeCsVmTRsigfsA75HE7/WvEU/okNcs4T+blcV6uYDkahD94oYcS4v0hLLT7R0dwScMBeSjapmECjfB5bZXkjA5Rs9aT/ky4VJ/T0DZZYBK6/JdqIk2MvpZHzhHAcfLYEj+Vghj40cyo0KzuRyehTJaTnOMca7Pb+cbt/FsvUHMRZ7+v9sG7Oe8P7eIkVKpmReSfxoUwmPy3DsNSwtfAcn0mvZZMwsnrJvb3AqaEx/7hEzEqruGXs5Ig98QDCvSW9JA FoJsb2rc aQ+QL9ejnE0hh+5NhieUYGfLQ+cXCueIOqekvYyEW9Q9VqlPdrqKZxNLjjlyufCQxywGIsw0agrBBGH7f2X/z8NH2VJlwY4oheQbYik8XTc3mNcEEqwDgliHpG9C/yf1JS06hxnTa0b7Tvk+81X8o8KOtcGfH0bJbZzLUZyNrNCXsiHvOoZwuVZxAT8iI3v2e5FSrVaWiuA1PEIofNDI022hglxK1ko7DdGW1kZu+bIy/XXGmXLEPV58uUiY+4nw8DR1ADQjwVsBlcRpW8G8G3arasCxVbmOlkE+0H3ID/8P8OiS+hqzyT7YI3Tszynj/TRTiFy9mQgvN+CqNnoh8dlV0Nw== 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: On Wed, 31 May 2023 at 09:51, Christoph Hellwig wrote: > > 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 | 24 ++---------------------- > 1 file changed, 2 insertions(+), 22 deletions(-) > > diff --git a/fs/fuse/file.c b/fs/fuse/file.c > index 025973ad813e05..7a72dc0a691201 100644 > --- a/fs/fuse/file.c > +++ b/fs/fuse/file.c > @@ -1340,7 +1340,6 @@ 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); > @@ -1377,30 +1376,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) > goto out; > > if (iocb->ki_flags & IOCB_DIRECT) { > - loff_t pos, endbyte; > - > 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; > - } > - pos = iocb->ki_pos - written_buffered; > - endbyte = iocb->ki_pos - 1; > - > - err = filemap_write_and_wait_range(file->f_mapping, pos, > - endbyte); > - if (err) > - goto out; > - > - invalidate_mapping_pages(file->f_mapping, > - pos >> PAGE_SHIFT, > - endbyte >> PAGE_SHIFT); > - > - written += written_buffered; > + written = direct_write_fallback(iocb, from, written, > + generic_perform_write(iocb, from)); This should use fuse_perform_write(). Last version of the patch was correct; copy-paste error? Thanks, Miklos