diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:29:48 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:29:48 +1100 |
| commit | acb3e26fc3652d43cb5cf07c311ed55f3aecf40e (patch) | |
| tree | fb8d84b0bcfdd194544a50ccf87caf0ab1428454 /include/linux | |
| parent | 1b186d25b0dca16671fe9c2c86330a609cf55802 (diff) | |
| parent | 74c66bcb7eda551f3b8588659c58fe29184af903 (diff) | |
| download | cachepc-linux-acb3e26fc3652d43cb5cf07c311ed55f3aecf40e.tar.gz cachepc-linux-acb3e26fc3652d43cb5cf07c311ed55f3aecf40e.zip | |
Merge branch 'xfs-dio-fix-4.6' into for-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 1a2046275cdf..d7f37bfcbdce 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -70,7 +70,7 @@ extern int sysctl_protected_hardlinks; struct buffer_head; typedef int (get_block_t)(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create); -typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset, +typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, ssize_t bytes, void *private); typedef void (dax_iodone_t)(struct buffer_head *bh_map, int uptodate); |