diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-01 22:19:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-01 22:19:27 +0100 |
| commit | c1c09da07c550971a1764a113963533dcc8e4d2a (patch) | |
| tree | 19c2a4ddd55b55dcaddc1c0ba514105ef620c557 /fs | |
| parent | Merge tag 'bcachefs-2023-11-29' of https://evilpiepirate.org/git/bcachefs (diff) | |
| parent | ext2: Fix ki_pos update for DIO buffered-io fallback case (diff) | |
| download | linux-c1c09da07c550971a1764a113963533dcc8e4d2a.tar.xz linux-c1c09da07c550971a1764a113963533dcc8e4d2a.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext2/file.c | 1 |
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, |