summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-07-17 08:49:57 -0700
committerDarrick J. Wong <djwong@kernel.org>2023-07-17 08:49:57 -0700
commit20c64ec83a9f779a750bbbcc1d07d065702313a5 (patch)
treedfa675f384d91df8290bf1627ca603955578aad4 /fs
parentfdf0eaf11452d72945af31804e2a1048ee1b574c (diff)
downloadlinux-stable-20c64ec83a9f779a750bbbcc1d07d065702313a5.tar.gz
linux-stable-20c64ec83a9f779a750bbbcc1d07d065702313a5.tar.bz2
linux-stable-20c64ec83a9f779a750bbbcc1d07d065702313a5.zip
iomap: fix a regression for partial write errors
When write* wrote some data it should return the amount of written data and not the error code that caused it to stop. Fix a recent regression in iomap_file_buffered_write that caused it to return the errno instead. Fixes: 219580eea1ee ("iomap: update ki_pos in iomap_file_buffered_write") Reported-by: kernel test robot <oliver.sang@intel.com> Reported-by: Cyril Hrubis <chrubis@suse.cz> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Ritesh Harjani (IBM) <ritesh.harjani@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/iomap/buffered-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index adb92cdb24b0..7cc9f7274883 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -872,7 +872,7 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,
while ((ret = iomap_iter(&iter, ops)) > 0)
iter.processed = iomap_write_iter(&iter, i);
- if (unlikely(ret < 0))
+ if (unlikely(iter.pos == iocb->ki_pos))
return ret;
ret = iter.pos - iocb->ki_pos;
iocb->ki_pos += ret;