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:38 +0200 |
| commit | 83fb41b2f6e46ab3e0e12b4dd403dab9d41f2bd0 (patch) | |
| tree | 889eae14be110b872ad4a8dba99b377a121b020b /fs/iomap/seek.c | |
| parent | 302e1acd4c26a92d2679f91d13f368f7842c050e (diff) | |
| download | linux-stable-83fb41b2f6e46ab3e0e12b4dd403dab9d41f2bd0.tar.gz linux-stable-83fb41b2f6e46ab3e0e12b4dd403dab9d41f2bd0.tar.bz2 linux-stable-83fb41b2f6e46ab3e0e12b4dd403dab9d41f2bd0.zip | |
iomap: remove the length variable in iomap_seek_data
[ Upstream commit 3ac1d426510f97ace05093ae9f2f710d9cbe6215 ]
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>
Diffstat (limited to 'fs/iomap/seek.c')
| -rw-r--r-- | fs/iomap/seek.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c index c04bad4b2b43..c61b889235b3 100644 --- a/fs/iomap/seek.c +++ b/fs/iomap/seek.c @@ -186,27 +186,23 @@ loff_t iomap_seek_data(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_data_actor); + while (offset < size) { + ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT, + ops, &offset, iomap_seek_data_actor); if (ret < 0) return ret; if (ret == 0) - break; - + return offset; offset += ret; - length -= ret; } - if (length <= 0) - return -ENXIO; - return offset; + /* We've reached the end of the file without finding data */ + return -ENXIO; } EXPORT_SYMBOL_GPL(iomap_seek_data); |