github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iomap: remove the length variable in iomap_seek_data

Browse Source 
[ Upstream commit 3ac1d42651 ]

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>
This commit is contained in:
Christoph Hellwig 2021-07-15 09:58:04 -07:00 committed by Greg Kroah-Hartman
parent 6503940748
commit 8659186e72
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/iomap/seek.c
View File

@ -186,27 +186,23 @@ loff_t
iomap_seek_data(struct inode *inode, loff_t offset, const struct iomap_ops *ops) iomap_seek_data(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_data_actor); ops, &offset, iomap_seek_data_actor);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret == 0) if (ret == 0)
break; return offset;
offset += ret; offset += ret;
length -= ret;
} }
if (length <= 0) /* We've reached the end of the file without finding data */
return -ENXIO; return -ENXIO;
return offset;
} }
EXPORT_SYMBOL_GPL(iomap_seek_data); EXPORT_SYMBOL_GPL(iomap_seek_data);