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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04E0FC77B7A for ; Fri, 19 May 2023 21:53:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbjESVx5 (ORCPT ); Fri, 19 May 2023 17:53:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230148AbjESVxz (ORCPT ); Fri, 19 May 2023 17:53:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9808C10D for ; Fri, 19 May 2023 14:53:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3490B65B79 for ; Fri, 19 May 2023 21:53:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89B5FC433EF; Fri, 19 May 2023 21:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1684533233; bh=vOAUq3eltpujQe752QfBg8UxO49oVi0fnFNqpBFo2RQ=; h=Date:To:From:Subject:From; b=MgfyuAnhTGkMIThPyxbSWlUzxfnWjEZNjbjey9rFZVJpAF2k89rQ/GC2qiPjBk6TK GxgW/tTNKLgDljR0/FGRIyFGP9oRuneHi3Y7SbLpxbK5mFTJ61rGnZet9fw0GABpn4 XPXNBOiV+nJMhIP5riVc8uVN9X6jl5SM1B280JIY= Date: Fri, 19 May 2023 14:53:53 -0700 To: mm-commits@vger.kernel.org, xiubli@redhat.com, willy@infradead.org, viro@zeniv.linux.org.uk, tytso@mit.edu, trond.myklebust@hammerspace.com, miklos@szeredi.hu, jaegeuk@kernel.org, idryomov@gmail.com, dlemoal@kernel.org, djwong@kernel.org, chao@kernel.org, brauner@kernel.org, axboe@kernel.dk, anna@kernel.org, agruenba@redhat.com, hch@lst.de, akpm@linux-foundation.org From: Andrew Morton Subject: + fuse-update-ki_pos-in-fuse_perform_write.patch added to mm-unstable branch Message-Id: <20230519215353.89B5FC433EF@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: fuse: update ki_pos in fuse_perform_write has been added to the -mm mm-unstable branch. Its filename is fuse-update-ki_pos-in-fuse_perform_write.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/fuse-update-ki_pos-in-fuse_perform_write.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Christoph Hellwig Subject: fuse: update ki_pos in fuse_perform_write Date: Fri, 19 May 2023 11:35:19 +0200 Both callers of fuse_perform_write need to updated ki_pos, move it into common code. Link: https://lkml.kernel.org/r/20230519093521.133226-12-hch@lst.de Signed-off-by: Christoph Hellwig Cc: Alexander Viro Cc: Andreas Gruenbacher Cc: Anna Schumaker Cc: Chao Yu Cc: Christian Brauner Cc: Damien Le Moal Cc: Darrick J. Wong Cc: Ilya Dryomov Cc: Jaegeuk Kim Cc: Jens Axboe Cc: Matthew Wilcox (Oracle) Cc: Miklos Szeredi Cc: Theodore Ts'o Cc: Trond Myklebust Cc: Xiubo Li Signed-off-by: Andrew Morton --- fs/fuse/file.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) --- a/fs/fuse/file.c~fuse-update-ki_pos-in-fuse_perform_write +++ a/fs/fuse/file.c @@ -1329,7 +1329,10 @@ static ssize_t fuse_perform_write(struct fuse_write_update_attr(inode, pos, res); clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state); - return res > 0 ? res : err; + if (!res) + return err; + iocb->ki_pos += res; + return res; } static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) @@ -1378,42 +1381,36 @@ writethrough: goto out; if (iocb->ki_flags & IOCB_DIRECT) { - loff_t pos = iocb->ki_pos; written = generic_file_direct_write(iocb, from); if (written < 0 || !iov_iter_count(from)) goto out; - pos += written; - - written_buffered = fuse_perform_write(iocb, mapping, from, pos); + written_buffered = fuse_perform_write(iocb, mapping, from, + iocb->ki_pos); if (written_buffered < 0) { err = written_buffered; goto out; } - endbyte = pos + written_buffered - 1; + endbyte = iocb->ki_pos + written_buffered - 1; - err = filemap_write_and_wait_range(file->f_mapping, pos, + err = filemap_write_and_wait_range(file->f_mapping, + iocb->ki_pos, endbyte); if (err) goto out; invalidate_mapping_pages(file->f_mapping, - pos >> PAGE_SHIFT, + iocb->ki_pos >> PAGE_SHIFT, endbyte >> PAGE_SHIFT); written += written_buffered; - iocb->ki_pos = pos + written_buffered; + iocb->ki_pos += written_buffered; } else { written = fuse_perform_write(iocb, mapping, from, iocb->ki_pos); - if (written >= 0) - iocb->ki_pos += written; } out: current->backing_dev_info = NULL; inode_unlock(inode); - if (written > 0) - written = generic_write_sync(iocb, written); - return written ? written : err; } _ Patches currently in -mm which might be from hch@lst.de are iomap-update-ki_pos-a-little-later-in-iomap_dio_complete.patch filemap-update-ki_pos-in-generic_perform_write.patch filemap-assign-current-backing_dev_info-in-generic_perform_write.patch filemap-add-a-kiocb_write_and_wait-helper.patch filemap-add-a-kiocb_invalidate_pages-helper.patch filemap-add-a-kiocb_invalidate_post_write-helper.patch iomap-update-ki_pos-in-iomap_file_buffered_write.patch iomap-assign-current-backing_dev_info-in-iomap_file_buffered_write.patch iomap-use-kiocb_write_and_wait-and-kiocb_invalidate_pages.patch fs-factor-out-a-direct_write_fallback-helper.patch fuse-update-ki_pos-in-fuse_perform_write.patch fuse-drop-redundant-arguments-to-fuse_perform_write.patch fuse-use-direct_write_fallback.patch squashfs-dont-include-buffer_headh.patch