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 4A1CBC77B75 for ; Fri, 19 May 2023 21:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229508AbjESVxd (ORCPT ); Fri, 19 May 2023 17:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjESVxc (ORCPT ); Fri, 19 May 2023 17:53:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B81410D for ; Fri, 19 May 2023 14:53:31 -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 F07F965B77 for ; Fri, 19 May 2023 21:53:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54FE5C433EF; Fri, 19 May 2023 21:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1684533210; bh=3mFRf+cTaJC+gcdaDyEe9+Coe/D4FnUf/6rLK52pnzg=; h=Date:To:From:Subject:From; b=yTSj1HAfMZk5sw3clD81wSZLpzCSaOMi+7SkFHo8uZCJSnjNdg+5Xd0f+qLcyncqS 5ZyJStkwdlMGHZOgd68ZLZWLYh6ncztDSEam37iajuL61XMtx6GYsc7/HhUSyHjPpU oA6Z9LrDIWQSOuZxh6d0rUZX6fM5bdrp0ASD3O/c= Date: Fri, 19 May 2023 14:53:29 -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: + filemap-update-ki_pos-in-generic_perform_write.patch added to mm-unstable branch Message-Id: <20230519215330.54FE5C433EF@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: filemap: update ki_pos in generic_perform_write has been added to the -mm mm-unstable branch. Its filename is filemap-update-ki_pos-in-generic_perform_write.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/filemap-update-ki_pos-in-generic_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: filemap: update ki_pos in generic_perform_write Date: Fri, 19 May 2023 11:35:10 +0200 All callers of generic_perform_write need to updated ki_pos, move it into common code. Link: https://lkml.kernel.org/r/20230519093521.133226-3-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/ceph/file.c | 2 -- fs/ext4/file.c | 9 +++------ fs/f2fs/file.c | 1 - fs/nfs/file.c | 1 - mm/filemap.c | 8 ++++---- 5 files changed, 7 insertions(+), 14 deletions(-) --- a/fs/ceph/file.c~filemap-update-ki_pos-in-generic_perform_write +++ a/fs/ceph/file.c @@ -1894,8 +1894,6 @@ retry_snap: * can not run at the same time */ written = generic_perform_write(iocb, from); - if (likely(written >= 0)) - iocb->ki_pos = pos + written; ceph_end_io_write(inode); } --- a/fs/ext4/file.c~filemap-update-ki_pos-in-generic_perform_write +++ a/fs/ext4/file.c @@ -291,12 +291,9 @@ static ssize_t ext4_buffered_write_iter( out: inode_unlock(inode); - if (likely(ret > 0)) { - iocb->ki_pos += ret; - ret = generic_write_sync(iocb, ret); - } - - return ret; + if (unlikely(ret <= 0)) + return ret; + return generic_write_sync(iocb, ret); } static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset, --- a/fs/f2fs/file.c~filemap-update-ki_pos-in-generic_perform_write +++ a/fs/f2fs/file.c @@ -4522,7 +4522,6 @@ static ssize_t f2fs_buffered_write_iter( current->backing_dev_info = NULL; if (ret > 0) { - iocb->ki_pos += ret; f2fs_update_iostat(F2FS_I_SB(inode), inode, APP_BUFFERED_IO, ret); } --- a/fs/nfs/file.c~filemap-update-ki_pos-in-generic_perform_write +++ a/fs/nfs/file.c @@ -658,7 +658,6 @@ ssize_t nfs_file_write(struct kiocb *ioc goto out; written = result; - iocb->ki_pos += written; nfs_add_stats(inode, NFSIOS_NORMALWRITTENBYTES, written); if (mntflags & NFS_MOUNT_WRITE_EAGER) { --- a/mm/filemap.c~filemap-update-ki_pos-in-generic_perform_write +++ a/mm/filemap.c @@ -3930,7 +3930,10 @@ again: balance_dirty_pages_ratelimited(mapping); } while (iov_iter_count(i)); - return written ? written : status; + if (!written) + return status; + iocb->ki_pos += written; + return written; } EXPORT_SYMBOL(generic_perform_write); @@ -4009,7 +4012,6 @@ ssize_t __generic_file_write_iter(struct endbyte = pos + status - 1; err = filemap_write_and_wait_range(mapping, pos, endbyte); if (err == 0) { - iocb->ki_pos = endbyte + 1; written += status; invalidate_mapping_pages(mapping, pos >> PAGE_SHIFT, @@ -4022,8 +4024,6 @@ ssize_t __generic_file_write_iter(struct } } else { written = generic_perform_write(iocb, from); - if (likely(written > 0)) - iocb->ki_pos += written; } out: current->backing_dev_info = NULL; _ 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