Merge tag 'fs_for_v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

torvalds · torvalds · commit c1c09da07c55 · 2023-12-02T06:19:27.000+09:00
Pull ext2 fix from Jan Kara:
 "Fix an ext2 bug introduced by changes in ext2 &amp; 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
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,6 @@ static ssize_t ext2_dio_write_iter(struct kiocb iocb, struct iov_iter from)`
`258`	`258`	`goto out_unlock;`
`259`	`259`	`}`
`260`	`260`
`261`		`- iocb->ki_pos += status;`
`262`	`261`	`ret += status;`
`263`	`262`	`endbyte = pos + status - 1;`
`264`	`263`	`ret2 = filemap_write_and_wait_range(inode->i_mapping, pos,`