iomap: do some small logical cleanup in buffered write

Since iomap_write_end() can never return a partial write length, the
comparison between written, copied and bytes becomes useless, just
merge them with the unwritten branch.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://lore.kernel.org/r/20240320110548.2200662-10-yi.zhang@huaweicloud.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Zhang Yi 2024-03-20 19:05:48 +08:00 committed by Christian Brauner
parent 815f4b633b
commit e1f453d433
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2

View File

@ -975,11 +975,6 @@ retry:
if (old_size < pos)
pagecache_isize_extended(iter->inode, old_size, pos);
if (written < bytes)
iomap_write_failed(iter->inode, pos + written,
bytes - written);
if (unlikely(copied != written))
iov_iter_revert(i, copied - written);
cond_resched();
if (unlikely(written == 0)) {
@ -989,6 +984,9 @@ retry:
* halfway through, might be a race with munmap,
* might be severe memory pressure.
*/
iomap_write_failed(iter->inode, pos, bytes);
iov_iter_revert(i, copied);
if (chunk > PAGE_SIZE)
chunk /= 2;
if (copied) {