Skip to content

Commit e3df41f

Browse files
committed
Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio
2 parents 9484ab1 + f782088 commit e3df41f

30 files changed

+961
-1064
lines changed

fs/iomap.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,7 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length,
433433
struct page *page = data;
434434
int ret;
435435

436-
ret = __block_write_begin_int(page, pos & ~PAGE_MASK, length,
437-
NULL, iomap);
436+
ret = __block_write_begin_int(page, pos, length, NULL, iomap);
438437
if (ret)
439438
return ret;
440439

@@ -562,7 +561,7 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi,
562561
}
563562

564563
while (len > 0) {
565-
ret = iomap_apply(inode, start, len, 0, ops, &ctx,
564+
ret = iomap_apply(inode, start, len, IOMAP_REPORT, ops, &ctx,
566565
iomap_fiemap_actor);
567566
/* inode with no (attribute) mapping will give ENOENT */
568567
if (ret == -ENOENT)

0 commit comments

Comments
 (0)