xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iomap: remove the length variable in iomap_seek_hole

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

9
fs/iomap/seek.c
View File

@@ -140,23 +140,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;