Commit befa9005 authored Jul 15, 2021 by Christoph Hellwig Committed by Greg Kroah-Hartman Jul 31, 2021

iomap: remove the length variable in iomap_seek_hole



[ Upstream commit 49694d14ff68fa4b5f86019dbcfb44a8bd213e58 ]

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: Christoph Hellwig <hch@lst.de>
Reported-by: Leizhen (ThunderTown) <thunder.leizhen@huawei.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 83fb41b2

fs/iomap/seek.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -140,23 +140,20 @@ loff_t
		iomap_seek_hole(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_hole_actor);
		while (offset < size) {
		ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,
		ops, &offset, iomap_seek_hole_actor);
		if (ret < 0)
		return ret;
		if (ret == 0)
		break;

		offset += ret;
		length -= ret;
		}

		return offset;