From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Leizhen <thunder.leizhen@huawei.com>
Subject: Re: [PATCH 1/2] iomap: remove the length variable in iomap_seek_data
Date: Tue, 6 Jul 2021 17:28:27 -0700 [thread overview]
Message-ID: <20210707002827.GI11588@locust> (raw)
In-Reply-To: <20210706050541.1974618-1-hch@lst.de>
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
>
prev parent reply other threads:[~2021-07-07 0:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707002827.GI11588@locust \
--to=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=thunder.leizhen@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).