Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3df41f9 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio

parents 9484ab1b f782088c

fs/iomap.c

+2 −3
Original line number Diff line number Diff line
@@ -433,8 +433,7 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length, 
	struct page *page = data;

	int ret;



	ret = __block_write_begin_int(page, pos & ~PAGE_MASK, length,

			NULL, iomap);

	ret = __block_write_begin_int(page, pos, length, NULL, iomap);

	if (ret)

		return ret;
@@ -562,7 +561,7 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, 
	}



	while (len > 0) {

		ret = iomap_apply(inode, start, len, 0, ops, &ctx,

		ret = iomap_apply(inode, start, len, IOMAP_REPORT, ops, &ctx,

				iomap_fiemap_actor);

		/* inode with no (attribute) mapping will give ENOENT */

		if (ret == -ENOENT)