diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-11-03 13:28:41 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-11-03 13:28:41 +1100 |
| commit | 264e89ad3412ce1e2977e5e807bcf7d20d3b0a59 (patch) | |
| tree | 53841fc9aed8f419765e41af5879e18d51982ca0 /fs/xfs/xfs_aops.h | |
| parent | 2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4 (diff) | |
| parent | 13ad4fe3e087ab66a140f1e00d98f28aa4e3bb28 (diff) | |
| download | op-kernel-dev-264e89ad3412ce1e2977e5e807bcf7d20d3b0a59.zip op-kernel-dev-264e89ad3412ce1e2977e5e807bcf7d20d3b0a59.tar.gz | |
Merge branch 'xfs-dax-updates' into for-next
Diffstat (limited to 'fs/xfs/xfs_aops.h')
| -rw-r--r-- | fs/xfs/xfs_aops.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h index 86afd1a..f6ffc9a 100644 --- a/fs/xfs/xfs_aops.h +++ b/fs/xfs/xfs_aops.h @@ -58,7 +58,8 @@ int xfs_get_blocks(struct inode *inode, sector_t offset, struct buffer_head *map_bh, int create); int xfs_get_blocks_direct(struct inode *inode, sector_t offset, struct buffer_head *map_bh, int create); -void xfs_end_io_dax_write(struct buffer_head *bh, int uptodate); +int xfs_get_blocks_dax_fault(struct inode *inode, sector_t offset, + struct buffer_head *map_bh, int create); extern void xfs_count_page_state(struct page *, int *, int *); |
