From nobody Mon Feb 9 04:13:58 2026 Received: from fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com [52.28.197.132]) (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 8E80D27F005; Tue, 21 Oct 2025 07:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.28.197.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761030644; cv=none; b=rhjr8SfJQ4LIMS6sB36jGrRtloqZhrH4tbTnsPuioZZ5Qu/vFRXKaoZTyMEpnqw0JHrskpJR/n8nnEVAYeuRTAQyUQXU4rkcZMnzM3/jAoCXAPcjYnfw9i9hrjl1TuCz7IK5q2ZUk6PlhkT3rRI7UJ3y4umE5t3d0IByij6TD6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761030644; c=relaxed/simple; bh=+tk/FutCRm8YcGzprGsostpgdVHh9u+7caB92/41LIQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BbKXTHO0gifUFUOzOG9+PPXOpYKn4PKaGWl2y1g2j9cmgea/1XSmrH1wUF9UJu7YG2o4vPsVU73wfqvDBrlsrZunHiIAL0+urmEBo4u6IUnwbaJryrdw8a72EyIzOSLqkFv067JSdG9UwmbKSBxduHC5nvYAu9KmFRR4xw00lPQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de; spf=pass smtp.mailfrom=amazon.de; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b=lCH5OWQK; arc=none smtp.client-ip=52.28.197.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b="lCH5OWQK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazoncorp2; t=1761030642; x=1792566642; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HA9qae2hxkl8hOt3UHdMdc2bodJDRIauUiWzAAKxlsQ=; b=lCH5OWQK7H6goS/t75kWaW21hXndHOlULq3510V9bnnh9FiPqafo//Kv 01ZrrhtfuOpI/0hV0vPP2432tGMw021YU1ULklT/T2yVjXprPEAWnmyum J9ns06hvJRkCQBQ0vK+A+Z5dLov90fJxZNkl43gD0yMHV8WOaVgDeKFpp Fi4v3Rh3QfMuW8CxqxQvDTq+pMFrv5HWV4aW+7Qzg/0YvAhMNP38sjix6 4aW2jEvzPZtd6J5KedxTCig8fXf/zZZadJ8pVM3+LeXAhlf+EU+H1DLgU 1d1nJ4EokJUZ04Gnx3vVk7FQy/L4v3COH0+jUX9n4ctZcCRciDW8tu+8t Q==; X-CSE-ConnectionGUID: jh51iiDKQJqIacjSQTTaqQ== X-CSE-MsgGUID: fUMgNCHbQ2Gy7BekZqIj0g== X-IronPort-AV: E=Sophos;i="6.19,244,1754956800"; d="scan'208";a="3831851" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2025 07:10:31 +0000 Received: from EX19MTAEUA002.ant.amazon.com [54.240.197.232:19308] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.38.159:2525] with esmtp (Farcaster) id 76ee5b86-eab3-4d96-a848-ee94f9729fd2; Tue, 21 Oct 2025 07:10:30 +0000 (UTC) X-Farcaster-Flow-ID: 76ee5b86-eab3-4d96-a848-ee94f9729fd2 Received: from EX19D013EUB004.ant.amazon.com (10.252.51.92) by EX19MTAEUA002.ant.amazon.com (10.252.50.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Tue, 21 Oct 2025 07:10:29 +0000 Received: from dev-dsk-mngyadam-1c-cb3f7548.eu-west-1.amazon.com (10.253.107.175) by EX19D013EUB004.ant.amazon.com (10.252.51.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Tue, 21 Oct 2025 07:10:18 +0000 From: Mahmoud Adam To: CC: , , Christoph Hellwig , Xiubo Li , Damien Le Moal , Hannes Reinecke , Theodore Ts'o , "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 , Jeff Layton , Andreas Dilger , Christoph Hellwig , "Ryusuke Konishi" , Luis Chamberlain , , , , , , , , , , Subject: [PATCH 6.1 3/8] filemap: update ki_pos in generic_perform_write Date: Tue, 21 Oct 2025 09:03:38 +0200 Message-ID: <20251021070353.96705-5-mngyadam@amazon.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021070353.96705-2-mngyadam@amazon.de> References: <20251021070353.96705-2-mngyadam@amazon.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EX19D036UWC002.ant.amazon.com (10.13.139.242) To EX19D013EUB004.ant.amazon.com (10.252.51.92) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 3336647e64df3a..5921bf278fff72 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1891,8 +1891,6 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, st= ruct iov_iter *from) * can not run at the same time */ written =3D generic_perform_write(iocb, from); - if (likely(written >=3D 0)) - iocb->ki_pos =3D pos + written; ceph_end_io_write(inode); } =20 diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 289b088f4ae58f..e84a144f3f8ed5 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -287,12 +287,9 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *= iocb, =20 out: inode_unlock(inode); - if (likely(ret > 0)) { - iocb->ki_pos +=3D ret; - ret =3D generic_write_sync(iocb, ret); - } - - return ret; + if (unlikely(ret <=3D 0)) + return ret; + return generic_write_sync(iocb, ret); } =20 static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t off= set, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 5e2a0cb8d24d92..09b85d086d16a6 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4661,7 +4661,6 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb = *iocb, current->backing_dev_info =3D NULL; =20 if (ret > 0) { - iocb->ki_pos +=3D ret; f2fs_update_iostat(F2FS_I_SB(inode), inode, APP_BUFFERED_IO, ret); } diff --git a/fs/nfs/file.c b/fs/nfs/file.c index d8ec889a4b3f76..c1be636ef25729 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -645,7 +645,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_i= ter *from) goto out; =20 written =3D result; - iocb->ki_pos +=3D written; nfs_add_stats(inode, NFSIOS_NORMALWRITTENBYTES, written); =20 if (mntflags & NFS_MOUNT_WRITE_EAGER) { diff --git a/mm/filemap.c b/mm/filemap.c index 39484af4300e3c..e2045266d2f2c9 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3891,7 +3891,10 @@ ssize_t generic_perform_write(struct kiocb *iocb, st= ruct iov_iter *i) balance_dirty_pages_ratelimited(mapping); } while (iov_iter_count(i)); =20 - return written ? written : status; + if (!written) + return status; + iocb->ki_pos +=3D written; + return written; } EXPORT_SYMBOL(generic_perform_write); =20 @@ -3970,7 +3973,6 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb,= struct iov_iter *from) endbyte =3D pos + status - 1; err =3D filemap_write_and_wait_range(mapping, pos, endbyte); if (err =3D=3D 0) { - iocb->ki_pos =3D endbyte + 1; written +=3D status; invalidate_mapping_pages(mapping, pos >> PAGE_SHIFT, @@ -3983,8 +3985,6 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb,= struct iov_iter *from) } } else { written =3D generic_perform_write(iocb, from); - if (likely(written > 0)) - iocb->ki_pos +=3D written; } out: current->backing_dev_info =3D NULL; --=20 2.47.3 Amazon Web Services Development Center Germany GmbH Tamara-Danz-Str. 13 10243 Berlin Geschaeftsfuehrung: Christian Schlaeger Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597