diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:51 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:51 -0400 |
| commit | dfea934575164497a9e36074ebce606a1a278ed9 (patch) | |
| tree | b39ec564ae5a84956af80ae43de24c4f91720519 /include/linux/fs.h | |
| parent | 165f1a6e300d5a1ffb57cf9a9c8762de731228f2 (diff) | |
| parent | 64b4e2526d1cf6e6a4db6213d6e2b6e6ab59479a (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/fs.h')
| -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 492948ea4c9b..c7b21db7782f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1569,7 +1569,7 @@ struct file_operations { long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *); - void (*mremap)(struct file *, struct vm_area_struct *); + int (*mremap)(struct file *, struct vm_area_struct *); int (*open) (struct inode *, struct file *); int (*flush) (struct file *, fl_owner_t id); int (*release) (struct inode *, struct file *); |