Commit 8fc274d1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

iomap: switch iomap_file_unshare to use iomap_iter

Switch iomap_file_unshare to use iomap_iter.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent ce83a025
...@@ -817,10 +817,12 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, ...@@ -817,10 +817,12 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,
} }
EXPORT_SYMBOL_GPL(iomap_file_buffered_write); EXPORT_SYMBOL_GPL(iomap_file_buffered_write);
static loff_t static loff_t iomap_unshare_iter(struct iomap_iter *iter)
iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
struct iomap *iomap, struct iomap *srcmap)
{ {
struct iomap *iomap = &iter->iomap;
struct iomap *srcmap = iomap_iter_srcmap(iter);
loff_t pos = iter->pos;
loff_t length = iomap_length(iter);
long status = 0; long status = 0;
loff_t written = 0; loff_t written = 0;
...@@ -836,12 +838,12 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data, ...@@ -836,12 +838,12 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
unsigned long bytes = min_t(loff_t, PAGE_SIZE - offset, length); unsigned long bytes = min_t(loff_t, PAGE_SIZE - offset, length);
struct page *page; struct page *page;
status = iomap_write_begin(inode, pos, bytes, status = iomap_write_begin(iter->inode, pos, bytes,
IOMAP_WRITE_F_UNSHARE, &page, iomap, srcmap); IOMAP_WRITE_F_UNSHARE, &page, iomap, srcmap);
if (unlikely(status)) if (unlikely(status))
return status; return status;
status = iomap_write_end(inode, pos, bytes, bytes, page, iomap, status = iomap_write_end(iter->inode, pos, bytes, bytes, page, iomap,
srcmap); srcmap);
if (WARN_ON_ONCE(status == 0)) if (WARN_ON_ONCE(status == 0))
return -EIO; return -EIO;
...@@ -852,7 +854,7 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data, ...@@ -852,7 +854,7 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
written += status; written += status;
length -= status; length -= status;
balance_dirty_pages_ratelimited(inode->i_mapping); balance_dirty_pages_ratelimited(iter->inode->i_mapping);
} while (length); } while (length);
return written; return written;
...@@ -862,18 +864,17 @@ int ...@@ -862,18 +864,17 @@ int
iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
const struct iomap_ops *ops) const struct iomap_ops *ops)
{ {
loff_t ret; struct iomap_iter iter = {
.inode = inode,
while (len) { .pos = pos,
ret = iomap_apply(inode, pos, len, IOMAP_WRITE, ops, NULL, .len = len,
iomap_unshare_actor); .flags = IOMAP_WRITE,
if (ret <= 0) };
return ret; int ret;
pos += ret;
len -= ret;
}
return 0; while ((ret = iomap_iter(&iter, ops)) > 0)
iter.processed = iomap_unshare_iter(&iter);
return ret;
} }
EXPORT_SYMBOL_GPL(iomap_file_unshare); EXPORT_SYMBOL_GPL(iomap_file_unshare);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment