From: Christoph Hellwig <hch@lst.de>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>,
Matthew Wilcox <willy@infradead.org>,
Andreas Gruenbacher <agruenba@redhat.com>,
Shiyang Ruan <ruansy.fnst@fujitsu.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-btrfs@vger.kernel.org, nvdimm@lists.linux.dev,
cluster-devel@redhat.com
Subject: [PATCH 21/30] iomap: switch iomap_seek_data to use iomap_iter
Date: Mon, 9 Aug 2021 08:12:35 +0200 [thread overview]
Message-ID: <20210809061244.1196573-22-hch@lst.de> (raw)
In-Reply-To: <20210809061244.1196573-1-hch@lst.de>
Rewrite iomap_seek_data to use iomap_iter.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/iomap/seek.c | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
index fed8f9005f9e46..a845c012b50c67 100644
--- a/fs/iomap/seek.c
+++ b/fs/iomap/seek.c
@@ -56,47 +56,48 @@ iomap_seek_hole(struct inode *inode, loff_t pos, const struct iomap_ops *ops)
}
EXPORT_SYMBOL_GPL(iomap_seek_hole);
-static loff_t
-iomap_seek_data_actor(struct inode *inode, loff_t start, loff_t length,
- void *data, struct iomap *iomap, struct iomap *srcmap)
+static loff_t iomap_seek_data_iter(const struct iomap_iter *iter,
+ loff_t *hole_pos)
{
- loff_t offset = start;
+ loff_t length = iomap_length(iter);
- switch (iomap->type) {
+ switch (iter->iomap.type) {
case IOMAP_HOLE:
return length;
case IOMAP_UNWRITTEN:
- offset = mapping_seek_hole_data(inode->i_mapping, start,
- start + length, SEEK_DATA);
- if (offset < 0)
+ *hole_pos = mapping_seek_hole_data(iter->inode->i_mapping,
+ iter->pos, iter->pos + length, SEEK_DATA);
+ if (*hole_pos < 0)
return length;
- fallthrough;
+ return 0;
default:
- *(loff_t *)data = offset;
+ *hole_pos = iter->pos;
return 0;
}
}
loff_t
-iomap_seek_data(struct inode *inode, loff_t offset, const struct iomap_ops *ops)
+iomap_seek_data(struct inode *inode, loff_t pos, const struct iomap_ops *ops)
{
loff_t size = i_size_read(inode);
- loff_t ret;
+ struct iomap_iter iter = {
+ .inode = inode,
+ .pos = pos,
+ .flags = IOMAP_REPORT,
+ };
+ int ret;
/* Nothing to be found before or beyond the end of the file. */
- if (offset < 0 || offset >= size)
+ if (pos < 0 || pos >= size)
return -ENXIO;
- 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)
- return offset;
- offset += ret;
- }
-
+ iter.len = size - pos;
+ while ((ret = iomap_iter(&iter, ops)) > 0)
+ iter.processed = iomap_seek_data_iter(&iter, &pos);
+ if (ret < 0)
+ return ret;
+ if (iter.len) /* found data before EOF */
+ return pos;
/* We've reached the end of the file without finding data */
return -ENXIO;
}
--
2.30.2
next prev parent reply other threads:[~2021-08-09 6:31 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 6:12 switch iomap to an iterator model v2 Christoph Hellwig
2021-08-09 6:12 ` [PATCH 01/30] iomap: fix a trivial comment typo in trace.h Christoph Hellwig
2021-08-09 6:12 ` [PATCH 02/30] iomap: remove the iomap arguments to ->page_{prepare,done} Christoph Hellwig
2021-08-09 6:12 ` [PATCH 03/30] iomap: mark the iomap argument to iomap_sector const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 04/30] iomap: mark the iomap argument to iomap_inline_data const Christoph Hellwig
2021-08-09 16:17 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 05/30] iomap: mark the iomap argument to iomap_inline_data_valid const Christoph Hellwig
2021-08-09 16:17 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 06/30] fs: mark the iomap argument to __block_write_begin_int const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 07/30] fsdax: mark the iomap argument to dax_iomap_sector as const Christoph Hellwig
2021-08-19 20:35 ` Dan Williams
2021-08-09 6:12 ` [PATCH 08/30] iomap: mark the iomap argument to iomap_read_inline_data const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 09/30] iomap: mark the iomap argument to iomap_read_page_sync const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 10/30] iomap: fix the iomap_readpage_actor return value for inline data Christoph Hellwig
2021-08-10 23:31 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 11/30] iomap: add the new iomap_iter model Christoph Hellwig
2021-08-09 22:10 ` Dave Chinner
2021-08-10 6:45 ` Darrick J. Wong
2021-08-10 7:13 ` Christoph Hellwig
2021-08-11 0:31 ` Darrick J. Wong
2021-08-11 5:38 ` Christoph Hellwig
2021-08-11 19:17 ` Darrick J. Wong
2021-08-12 6:49 ` Christoph Hellwig
2021-08-12 18:20 ` Darrick J. Wong
2021-08-13 7:29 ` Christoph Hellwig
2021-08-11 19:17 ` [PATCH v2.1 " Darrick J. Wong
2021-08-17 2:34 ` Dave Chinner
2021-08-19 21:25 ` [PATCH " Dan Williams
2021-08-20 4:11 ` Christoph Hellwig
2021-08-20 15:27 ` Dan Williams
2021-08-09 6:12 ` [PATCH 12/30] iomap: switch readahead and readpage to use iomap_iter Christoph Hellwig
2021-08-10 23:46 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 13/30] iomap: switch iomap_file_buffered_write " Christoph Hellwig
2021-08-10 23:53 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 14/30] iomap: switch iomap_file_unshare " Christoph Hellwig
2021-08-10 23:54 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 15/30] iomap: switch iomap_zero_range " Christoph Hellwig
2021-08-10 23:54 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 16/30] iomap: switch iomap_page_mkwrite " Christoph Hellwig
2021-08-10 23:58 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 17/30] iomap: switch __iomap_dio_rw " Christoph Hellwig
2021-08-11 0:17 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 18/30] iomap: switch iomap_fiemap " Christoph Hellwig
2021-08-11 0:05 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 19/30] iomap: switch iomap_bmap " Christoph Hellwig
2021-08-10 6:39 ` Darrick J. Wong
2021-08-10 7:13 ` Christoph Hellwig
2021-08-11 19:18 ` [PATCH v2.1 " Darrick J. Wong
2021-08-12 6:50 ` Christoph Hellwig
2021-08-17 2:35 ` Dave Chinner
2021-08-09 6:12 ` [PATCH 20/30] iomap: switch iomap_seek_hole " Christoph Hellwig
2021-08-11 0:13 ` Darrick J. Wong
2021-08-09 6:12 ` Christoph Hellwig [this message]
2021-08-11 0:12 ` [PATCH 21/30] iomap: switch iomap_seek_data " Darrick J. Wong
2021-08-09 6:12 ` [PATCH 22/30] iomap: switch iomap_swapfile_activate " Christoph Hellwig
2021-08-11 0:08 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 23/30] fsdax: switch dax_iomap_rw " Christoph Hellwig
2021-08-11 0:07 ` Darrick J. Wong
2021-08-19 21:55 ` Dan Williams
2021-08-09 6:12 ` [PATCH 24/30] iomap: remove iomap_apply Christoph Hellwig
2021-08-11 19:18 ` [PATCH v2.1 " Darrick J. Wong
2021-08-17 2:36 ` Dave Chinner
2021-08-09 6:12 ` [PATCH 25/30] iomap: pass an iomap_iter to various buffered I/O helpers Christoph Hellwig
2021-08-09 6:12 ` [PATCH 26/30] iomap: rework unshare flag Christoph Hellwig
2021-08-09 6:12 ` [PATCH 27/30] fsdax: factor out helpers to simplify the dax fault code Christoph Hellwig
2021-08-09 6:12 ` [PATCH 28/30] fsdax: factor out a dax_fault_actor() helper Christoph Hellwig
2021-08-09 6:12 ` [PATCH 29/30] fsdax: switch the fault handlers to use iomap_iter Christoph Hellwig
2021-08-09 6:12 ` [PATCH 30/30] iomap: constify iomap_iter_srcmap Christoph Hellwig
2021-08-11 19:19 ` [PATCH 31/30] iomap: move iomap iteration code to iter.c Darrick J. Wong
2021-08-17 2:37 ` Dave Chinner
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=20210809061244.1196573-22-hch@lst.de \
--to=hch@lst.de \
--cc=agruenba@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=djwong@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=ruansy.fnst@fujitsu.com \
--cc=willy@infradead.org \
/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).