diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-11-30 02:49:38 +0100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-11-30 02:49:38 +0100 |
| commit | e3df41f97847f60c3808b39dee1adcb72b3d4646 (patch) | |
| tree | e146ce6480868f74bb1fdf31ac522ae1aece648d /fs/iomap.c | |
| parent | dax: Introduce IOMAP_FAULT flag (diff) | |
| parent | xfs: pass post-eof speculative prealloc blocks to bmapi (diff) | |
| download | linux-e3df41f97847f60c3808b39dee1adcb72b3d4646.tar.xz linux-e3df41f97847f60c3808b39dee1adcb72b3d4646.zip | |
Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio
Diffstat (limited to 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 51a02573405e..13dd413b2b9c 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -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) |