Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83fb41b2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

iomap: remove the length variable in iomap_seek_data



[ Upstream commit 3ac1d426510f97ace05093ae9f2f710d9cbe6215 ]

The length variable is rather pointless given that it can be trivially
deduced from offset and size.  Also the initial calculation can lead
to KASAN warnings.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarLeizhen (ThunderTown) <thunder.leizhen@huawei.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 302e1acd
Loading
Loading
Loading
Loading
+6 −10
Original line number Diff line number Diff line
@@ -186,27 +186,23 @@ loff_t
iomap_seek_data(struct inode *inode, loff_t offset, const struct iomap_ops *ops)
{
	loff_t size = i_size_read(inode);
	loff_t length = size - offset;
	loff_t ret;

	/* Nothing to be found before or beyond the end of the file. */
	if (offset < 0 || offset >= size)
		return -ENXIO;

	while (length > 0) {
		ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,
				  &offset, iomap_seek_data_actor);
	while (offset < size) {
		ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,
				  ops, &offset, iomap_seek_data_actor);
		if (ret < 0)
			return ret;
		if (ret == 0)
			break;

			return offset;
		offset += ret;
		length -= ret;
	}

	if (length <= 0)
	/* We've reached the end of the file without finding data */
	return -ENXIO;
	return offset;
}
EXPORT_SYMBOL_GPL(iomap_seek_data);