]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
iomap: remove the length variable in iomap_seek_hole
authorChristoph Hellwig <hch@lst.de>
Thu, 15 Jul 2021 16:58:04 +0000 (09:58 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 20 Sep 2021 16:49:45 +0000 (18:49 +0200)
BugLink: https://bugs.launchpad.net/bugs/1940557
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
fs/iomap/seek.c

index c61b889235b37712e20ae3dfe1f719ca8f41ddc3..10c4c1e80124fe6e0a366d82daf9f092069bcd54 100644 (file)
@@ -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;