* [PATCH 1/2] iomap: remove the length variable in iomap_seek_data
@ 2021-07-06 5:05 Christoph Hellwig
2021-07-06 5:05 ` [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Christoph Hellwig @ 2021-07-06 5:05 UTC (permalink / raw)
To: linux-xfs; +Cc: linux-fsdevel, Leizhen
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>
---
fs/iomap/seek.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
index dab1b02eba5b7f..50b8f1418f2668 100644
--- a/fs/iomap/seek.c
+++ b/fs/iomap/seek.c
@@ -83,27 +83,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);
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole
2021-07-06 5:05 [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Christoph Hellwig
@ 2021-07-06 5:05 ` Christoph Hellwig
2021-07-06 17:45 ` Matthew Wilcox
2021-07-07 0:26 ` Darrick J. Wong
2021-07-06 17:45 ` [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Matthew Wilcox
2021-07-07 0:28 ` Darrick J. Wong
2 siblings, 2 replies; 6+ messages in thread
From: Christoph Hellwig @ 2021-07-06 5:05 UTC (permalink / raw)
To: linux-xfs; +Cc: linux-fsdevel, Leizhen
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>
---
fs/iomap/seek.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
index 50b8f1418f2668..ce6fb810854fec 100644
--- a/fs/iomap/seek.c
+++ b/fs/iomap/seek.c
@@ -35,23 +35,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;
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iomap: remove the length variable in iomap_seek_data
2021-07-06 5:05 [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Christoph Hellwig
2021-07-06 5:05 ` [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole Christoph Hellwig
@ 2021-07-06 17:45 ` Matthew Wilcox
2021-07-07 0:28 ` Darrick J. Wong
2 siblings, 0 replies; 6+ messages in thread
From: Matthew Wilcox @ 2021-07-06 17:45 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs, linux-fsdevel, Leizhen
On Tue, Jul 06, 2021 at 07:05:40AM +0200, Christoph Hellwig wrote:
> 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: Matthew Wilcox (Oracle) <willy@infradead.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole
2021-07-06 5:05 ` [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole Christoph Hellwig
@ 2021-07-06 17:45 ` Matthew Wilcox
2021-07-07 0:26 ` Darrick J. Wong
1 sibling, 0 replies; 6+ messages in thread
From: Matthew Wilcox @ 2021-07-06 17:45 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs, linux-fsdevel, Leizhen
On Tue, Jul 06, 2021 at 07:05:41AM +0200, Christoph Hellwig wrote:
> 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: Matthew Wilcox (Oracle) <willy@infradead.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole
2021-07-06 5:05 ` [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole Christoph Hellwig
2021-07-06 17:45 ` Matthew Wilcox
@ 2021-07-07 0:26 ` Darrick J. Wong
1 sibling, 0 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-07-07 0:26 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs, linux-fsdevel, Leizhen
On Tue, Jul 06, 2021 at 07:05:41AM +0200, Christoph Hellwig wrote:
> 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>
Wooot!
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/iomap/seek.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
> index 50b8f1418f2668..ce6fb810854fec 100644
> --- a/fs/iomap/seek.c
> +++ b/fs/iomap/seek.c
> @@ -35,23 +35,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;
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iomap: remove the length variable in iomap_seek_data
2021-07-06 5:05 [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Christoph Hellwig
2021-07-06 5:05 ` [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole Christoph Hellwig
2021-07-06 17:45 ` [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Matthew Wilcox
@ 2021-07-07 0:28 ` Darrick J. Wong
2 siblings, 0 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-07-07 0:28 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs, linux-fsdevel, Leizhen
On Tue, Jul 06, 2021 at 07:05:40AM +0200, Christoph Hellwig wrote:
> 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>
Looks good!
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/iomap/seek.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
> index dab1b02eba5b7f..50b8f1418f2668 100644
> --- a/fs/iomap/seek.c
> +++ b/fs/iomap/seek.c
> @@ -83,27 +83,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);
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-07 0:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 5:05 [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Christoph Hellwig
2021-07-06 5:05 ` [PATCH 2/2] iomap: remove the length variable in iomap_seek_hole Christoph Hellwig
2021-07-06 17:45 ` Matthew Wilcox
2021-07-07 0:26 ` Darrick J. Wong
2021-07-06 17:45 ` [PATCH 1/2] iomap: remove the length variable in iomap_seek_data Matthew Wilcox
2021-07-07 0:28 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).