Commit 49694d14 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: remove the length variable in iomap_seek_hole 



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>
parent 3ac1d426

fs/iomap/seek.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -35,23 +35,20 @@ loff_t 
iomap_seek_hole(struct inode *inode, loff_t offset, const struct iomap_ops *ops)

iomap_seek_hole(struct inode *inode, loff_t offset, const struct iomap_ops *ops)

{

{

	loff_t size = i_size_read(inode);

	loff_t size = i_size_read(inode);

	loff_t length = size - offset;

	loff_t ret;

	loff_t ret;





	/* Nothing to be found before or beyond the end of the file. */

	/* Nothing to be found before or beyond the end of the file. */

	if (offset < 0 || offset >= size)

	if (offset < 0 || offset >= size)

		return -ENXIO;

		return -ENXIO;





	while (length > 0) {

	while (offset < size) {

		ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,

		ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,

				  &offset, iomap_seek_hole_actor);

				  ops, &offset, iomap_seek_hole_actor);

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

		if (ret == 0)

		if (ret == 0)

			break;

			break;



		offset += ret;

		offset += ret;

		length -= ret;

	}

	}





	return offset;

	return offset;