aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-12-02 06:19:27 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2023-12-02 06:19:27 +0900
commitc1c09da07c550971a1764a113963533dcc8e4d2a (patch)
tree19c2a4ddd55b55dcaddc1c0ba514105ef620c557
parente6861be452a53a5de3e1a048eabd811a05a44915 (diff)
parent8abc712ea4867a81c860853048f24e511bbc20f2 (diff)
downloadlinux-xfs-c1c09da07c550971a1764a113963533dcc8e4d2a.tar.gz
Merge tag 'fs_for_v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext2 fix from Jan Kara: "Fix an ext2 bug introduced by changes in ext2 & iomap stepping on each other toes (apparently ext2 driver does not get much testing in linux-next)" * tag 'fs_for_v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Fix ki_pos update for DIO buffered-io fallback case
-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 1039e5bf90afd..4ddc36f4dbd40 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,