Commit 3590c4d8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: ignore non-shared or non-data blocks in xfs_file_dirty 



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 and don't need zeroing.  This will allow to simplify
the caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent dcd6158d

fs/iomap/buffered-io.c

+11 −4
Original line number Diff line number Diff line
@@ -887,12 +887,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 */
@@ -932,14 +939,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;
@@ -948,7 +955,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)

fs/xfs/xfs_reflink.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/iomap.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,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);