mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

iomap: switch iomap_seek_data to use iomap_iter 

Rewrite iomap_seek_data to use iomap_iter.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Christoph Hellwig 2021-08-10 18:33:12 -07:00 committed by Darrick J. Wong
parent 40670d18e8
commit c4740bf1ed
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fs/iomap/seek.c
View File

@ -56,47 +56,48 @@ iomap_seek_hole(struct inode *inode, loff_t pos, const struct iomap_ops *ops)
} }
EXPORT_SYMBOL_GPL(iomap_seek_hole); EXPORT_SYMBOL_GPL(iomap_seek_hole);
static loff_t static loff_t iomap_seek_data_iter(const struct iomap_iter *iter,
iomap_seek_data_actor(struct inode *inode, loff_t start, loff_t length, loff_t *hole_pos)
void *data, struct iomap *iomap, struct iomap *srcmap)
{ {
loff_t offset = start; loff_t length = iomap_length(iter);
switch (iomap->type) { switch (iter->iomap.type) {
case IOMAP_HOLE: case IOMAP_HOLE:
return length; return length;
case IOMAP_UNWRITTEN: case IOMAP_UNWRITTEN:
offset = mapping_seek_hole_data(inode->i_mapping, start, *hole_pos = mapping_seek_hole_data(iter->inode->i_mapping,
start + length, SEEK_DATA); iter->pos, iter->pos + length, SEEK_DATA);
if (offset < 0) if (*hole_pos < 0)
return length; return length;
fallthrough; return 0;
default: default:
*(loff_t *)data = offset; *hole_pos = iter->pos;
return 0; return 0;
} }
} }
loff_t 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 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. */ /* Nothing to be found before or beyond the end of the file. */
if (offset < 0 || offset >= size) if (pos < 0 || pos >= size)
return -ENXIO; return -ENXIO;
while (offset < size) { iter.len = size - pos;
ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT, while ((ret = iomap_iter(&iter, ops)) > 0)
ops, &offset, iomap_seek_data_actor); iter.processed = iomap_seek_data_iter(&iter, &pos);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret == 0) if (iter.len) /* found data before EOF */
return offset; return pos;
offset += ret;
}
/* We've reached the end of the file without finding data */ /* We've reached the end of the file without finding data */
return -ENXIO; return -ENXIO;
} }