On Mon, Sep 09, 2019 at 08:27:07PM +0200, Christoph Hellwig wrote:
> xfs_file_dirty is used to unshare reflink blocks. Rename the function
> to xfs_file_unshare to better document that purpose, and skip iomaps
> that are not shared are don't need zeroing. This will allow to simplify
^^^ "and"
> the caller.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Otherwise this looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/iomap/buffered-io.c | 15 +++++++++++----
> fs/xfs/xfs_reflink.c | 2 +-
> include/linux/iomap.h | 2 +-
> 3 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 33e03992d8a7..0b05551d9b5a 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -872,12 +872,19 @@ __iomap_read_page(struct inode *inode, loff_t offset)
> }
>
> static loff_t
> -iomap_dirty_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
> +iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
> struct iomap *iomap)
> {
> long status = 0;
> ssize_t written = 0;
>
> + /* don't bother with blocks that are not shared to start with */
> + if (!(iomap->flags & IOMAP_F_SHARED))
> + return length;
> + /* don't bother with holes or unwritten extents */
> + if (iomap->type == IOMAP_HOLE || iomap->type == IOMAP_UNWRITTEN)
> + return length;
> +
> do {
> struct page *page, *rpage;
> unsigned long offset; /* Offset into pagecache page */
> @@ -917,14 +924,14 @@ iomap_dirty_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
> }
>
> int
> -iomap_file_dirty(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)
> {
> loff_t ret;
>
> while (len) {
> ret = iomap_apply(inode, pos, len, IOMAP_WRITE, ops, NULL,
> - iomap_dirty_actor);
> + iomap_unshare_actor);
> if (ret <= 0)
> return ret;
> pos += ret;
> @@ -933,7 +940,7 @@ iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len,
>
> return 0;
> }
> -EXPORT_SYMBOL_GPL(iomap_file_dirty);
> +EXPORT_SYMBOL_GPL(iomap_file_unshare);
>
> static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset,
> unsigned bytes, struct iomap *iomap)
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index c4ec7afd1170..cadc0456804d 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -1442,7 +1442,7 @@ xfs_reflink_dirty_extents(
> flen = XFS_FSB_TO_B(mp, rlen);
> if (fpos + flen > isize)
> flen = isize - fpos;
> - error = iomap_file_dirty(VFS_I(ip), fpos, flen,
> + error = iomap_file_unshare(VFS_I(ip), fpos, flen,
> &xfs_iomap_ops);
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> if (error)
> diff --git a/include/linux/iomap.h b/include/linux/iomap.h
> index 8adcc8dd4498..3a0f0975a57e 100644
> --- a/include/linux/iomap.h
> +++ b/include/linux/iomap.h
> @@ -183,7 +183,7 @@ int iomap_migrate_page(struct address_space *mapping, struct page *newpage,
> #else
> #define iomap_migrate_page NULL
> #endif
> -int iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len,
> +int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
> const struct iomap_ops *ops);
> int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
> bool *did_zero, const struct iomap_ops *ops);
> --
> 2.20.1
>
