diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-07-15 09:58:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-31 08:19:39 +0200 |
| commit | befa900533a92b8f989012f89de83f4ad5fb9b9d (patch) | |
| tree | 0f7e142c5b017f12b8098128d35537b821bb032c | |
| parent | 83fb41b2f6e46ab3e0e12b4dd403dab9d41f2bd0 (diff) | |
| download | linux-stable-befa900533a92b8f989012f89de83f4ad5fb9b9d.tar.gz linux-stable-befa900533a92b8f989012f89de83f4ad5fb9b9d.tar.bz2 linux-stable-befa900533a92b8f989012f89de83f4ad5fb9b9d.zip | |
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>
| -rw-r--r-- | fs/iomap/seek.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c index c61b889235b3..10c4c1e80124 100644 --- a/fs/iomap/seek.c +++ b/fs/iomap/seek.c @@ -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; |