From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 865C2357A59; Wed, 3 Dec 2025 16:20:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778842; cv=none; b=tHYta27pLtF7Zr8NL5VGLIVRbw9S/f4p24LLBOeYFYy7MUErJ7Rovx3jsr4vdQ24Ye/TeulIN1S8DnwH8h34p8+5S0HUFw1o7S3M097F2Mc+/OilAMW4rJbIB8/+KTE20fS2MJ1YXm2hI5fh5S97259BCHWAluqHPODliEFZKpo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778842; c=relaxed/simple; bh=GNWw381WYnNFS2cCTL/DhX7ktNlGo4eYqN90nuoU98Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oAYuFInMZ3zjpPmkLPW0sYmMlCG7qII7oA+q9c7PREgZwEUsBkx0KKCGM6UzsF+wyd03KdjnMdvsc27GPlbSL8Oh8Ss3G4+YgY1P8HsfuP0C4VyJ/kIXNIHEmZBiBhF+ltGwfF8MnASXofsN04FwAlWQsVLapcGBi6r/GxL/BMA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M4M/5Qu0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="M4M/5Qu0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 959ABC4CEF5; Wed, 3 Dec 2025 16:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778842; bh=GNWw381WYnNFS2cCTL/DhX7ktNlGo4eYqN90nuoU98Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M4M/5Qu0oZseV6yeBDWyRbeDX+1TmR4FUQOrGxgQx+xlgiicjH0WRIcTxG3+5gZX0 02SGtbpydLN2w3PfqbPyAmB0e6ZnQoZIOSE2Ur4p8LVKiqde71Mcbr9oTuPq8S2fDT k2jNdKin7x1DLA+o1fcivW/jeX7TTE7M+qFOSv7c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Xiubo Li , Damien Le Moal , Hannes Reinecke , Theodore Tso , "Darrick J. Wong" , Al Viro , Andreas Gruenbacher , Anna Schumaker , Chao Yu , Christian Brauner , Ilya Dryomov , Jaegeuk Kim , Jens Axboe , Johannes Thumshirn , Matthew Wilcox , Miklos Szeredi , Miklos Szeredi , Trond Myklebust , Andrew Morton , Mahmoud Adam Subject: [PATCH 6.1 077/568] filemap: update ki_pos in generic_perform_write Date: Wed, 3 Dec 2025 16:21:19 +0100 Message-ID: <20251203152443.539275284@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig commit 182c25e9c157f37bd0ab5a82fe2417e2223df459 upstream. All callers of generic_perform_write need to updated ki_pos, move it into common code. Link: https://lkml.kernel.org/r/20230601145904.1385409-4-hch@lst.de Signed-off-by: Christoph Hellwig Reviewed-by: Xiubo Li Reviewed-by: Damien Le Moal Reviewed-by: Hannes Reinecke Acked-by: Theodore Ts'o Acked-by: Darrick J. Wong Cc: Al Viro Cc: Andreas Gruenbacher Cc: Anna Schumaker Cc: Chao Yu Cc: Christian Brauner Cc: Ilya Dryomov Cc: Jaegeuk Kim Cc: Jens Axboe Cc: Johannes Thumshirn Cc: Matthew Wilcox Cc: Miklos Szeredi Cc: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Mahmoud Adam Signed-off-by: Greg Kroah-Hartman --- 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 +++ b/fs/ceph/file.c @@ -1891,8 +1891,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 +++ b/fs/ext4/file.c @@ -287,12 +287,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 +++ b/fs/f2fs/file.c @@ -4659,7 +4659,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 +++ b/fs/nfs/file.c @@ -645,7 +645,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 +++ b/mm/filemap.c @@ -3891,7 +3891,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); @@ -3970,7 +3973,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, @@ -3983,8 +3985,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;