ext2: preserve completed DIO bytes when buffered fallback fails
Subsystems (2)
PATCH 1/1 ext2: preserve completed DIO bytes when buffered fallback fails
ext2_dio_write_iter() can complete part of a direct write before falling back to buffered I/O for a hole inside i_size. If generic_perform_write() then fails, its error overwrites the completed direct-I/O byte count.
For example, on a full filesystem, an 8 KiB write to a file with an allocated 4 KiB prefix and a 4 KiB hole overwrites the prefix but returns ENOSPC and leaves the file position unchanged. GNU dd with oflag=direct consequently reports zero bytes written.
Preserve a positive direct-I/O result and return the buffered error when no bytes were direct-written. This restores the fallback policy of generic_file_write_iter(), which ext2 used before its iomap conversion.
--- fs/ext2/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext2/file.c +2 -1
@@ -145,7 +145,8 @@ static ssize_t ext2_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) pos = iocb->ki_pos; status =generic_perform_write (iocb, from);if (unlikely (status <0 )) { - ret = status; +if (!ret) + ret = status; goto out_unlock; }
Signature · 1 line
2.43.0
[email protected]
AI reviewSashiko has reviewed this patch and found no issues.
Quoted 10 lines
ext2_dio_write_iter()can complete part of a direct write before falling back to buffered I/O for a hole insidei_size. Ifgeneric_perform_write()then fails, its error overwrites the completed direct-I/O byte count.For example, on a full filesystem, an 8 KiB write to a file with an allocated 4 KiB prefix and a 4 KiB hole overwrites the prefix but returns ENOSPC and leaves the file position unchanged. GNU dd with oflag=direct consequently reports zero bytes written.
Quoted 7 lines
Preserve a positive direct-I/O result and return the buffered error when no bytes were direct-written. This restores the fallback policy of
generic_file_write_iter(), which ext2 used before its iomap conversion.Fixes fb5de4358e1a ("ext2: Move direct-io to use iomap")Signed-off-by Hungyu Lin <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 10 lines · Hungyu Lin
ext2_dio_write_iter()can complete part of a direct write before falling back to buffered I/O for a hole insidei_size. Ifgeneric_perform_write()then fails, its error overwrites the completed direct-I/O byte count.For example, on a full filesystem, an 8 KiB write to a file with an allocated 4 KiB prefix and a 4 KiB hole overwrites the prefix but returns ENOSPC and leaves the file position unchanged. GNU dd with oflag=direct consequently reports zero bytes written.
Quoted 7 lines
Preserve a positive direct-I/O result and return the buffered error when no bytes were direct-written. This restores the fallback policy of
generic_file_write_iter(), which ext2 used before its iomap conversion.Fixes fb5de4358e1a ("ext2: Move direct-io to use iomap")Signed-off-by Hungyu Lin <[email protected]>
Thanks. Applied to my tree.
Honza
Quoted 21 lines
--- fs/ext2/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/ext2/file.c +2
-1@@ -145,7 +145,8 @@ static ssize_t ext2_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) pos = iocb->ki_pos; status =generic_perform_write (iocb, from);if (unlikely (status <0 )) { - ret = status; +if (!ret) + ret = status; goto out_unlock; }Signature · 1 line
2.43.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR