summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRitesh Harjani (IBM) <ritesh.list@gmail.com>2023-11-22 12:02:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-12-08 10:52:19 +0300
commitc5b09a65b4bac4e1c31ce94d3cdf5ea547ea1ff5 (patch)
treef80de3602a19c4184e86c8826ff0f570640828ec /fs
parent0daf3b0fe4a731f17635d703e0befdbfe9d494de (diff)
downloadlinux-c5b09a65b4bac4e1c31ce94d3cdf5ea547ea1ff5.tar.xz
ext2: Fix ki_pos update for DIO buffered-io fallback case
commit 8abc712ea4867a81c860853048f24e511bbc20f2 upstream. Commit "filemap: update ki_pos in generic_perform_write", made updating of ki_pos into common code in generic_perform_write() function. This also causes generic/091 to fail. This happened due to an in-flight collision with: fb5de4358e1a ("ext2: Move direct-io to use iomap"). I have chosen fixes tag based on which commit got landed later to upstream kernel. Fixes: 182c25e9c157 ("filemap: update ki_pos in generic_perform_write") Cc: stable@vger.kernel.org Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz> Message-Id: <d595bee9f2475ed0e8a2e7fb94f7afc2c6ffc36a.1700643443.git.ritesh.list@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/file.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 1039e5bf90af..4ddc36f4dbd4 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -258,7 +258,6 @@ static ssize_t ext2_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
goto out_unlock;
}
- iocb->ki_pos += status;
ret += status;
endbyte = pos + status - 1;
ret2 = filemap_write_and_wait_range(inode->i_mapping, pos,