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.

Christoph Hellwig committed 7 years ago

Commit 3590c4d1 parent dcd61583 files · +13 −6Browse files

Unified · Split

3 files

fs/iomap/buffered-io.c +11 −4
fs/xfs/xfs_reflink.c +1 −1
include/linux/iomap.h +1 −1

fs/iomap/buffered-io.c+11−4

 }
 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 */
 }
 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;
 	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

@@ -1442,7 +1442,7 @@ xfs_reflink_dirty_extents( · 1441 unmodified lines
1442	flen = XFS_FSB_TO_B(mp, rlen);	1442	flen = XFS_FSB_TO_B(mp, rlen);
1443	if (fpos + flen > isize)	1443	if (fpos + flen > isize)
1444	flen = isize - fpos;	1444	flen = isize - fpos;
1445	error = iomap_file_dirty(VFS_I(ip), fpos, flen,	1445	error = iomap_file_unshare(VFS_I(ip), fpos, flen,
1446	&xfs_iomap_ops);	1446	&xfs_iomap_ops);
1447	xfs_ilock(ip, XFS_ILOCK_EXCL);	1447	xfs_ilock(ip, XFS_ILOCK_EXCL);
1448	if (error)	1448	if (error)

include/linux/iomap.h+1−1

@@ -168,7 +168,7 @@ int iomap_migrate_page(struct address_space mapping, struct page newpage, · 167 unmodified lines
168	#else	168	#else
169	#define iomap_migrate_page NULL	169	#define iomap_migrate_page NULL
170	#endif	170	#endif
171	int iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len,	171	int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
172	const struct iomap_ops *ops);	172	const struct iomap_ops *ops);
173	int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,	173	int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
174	bool did_zero, const struct iomap_ops ops);	174	bool did_zero, const struct iomap_ops ops);

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code