diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /include/linux/fs.h | |
| parent | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (diff) | |
| parent | 030b533c4fd4d2ec3402363323de4bb2983c9cee (diff) | |
Merge remote-tracking branch 'jk/vfs' into work.misc
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 9347f4a2abed..46acb6804652 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -3007,7 +3007,7 @@ extern int buffer_migrate_page(struct address_space *, | |||
| 3007 | #define buffer_migrate_page NULL | 3007 | #define buffer_migrate_page NULL |
| 3008 | #endif | 3008 | #endif |
| 3009 | 3009 | ||
| 3010 | extern int inode_change_ok(const struct inode *, struct iattr *); | 3010 | extern int setattr_prepare(struct dentry *, struct iattr *); |
| 3011 | extern int inode_newsize_ok(const struct inode *, loff_t offset); | 3011 | extern int inode_newsize_ok(const struct inode *, loff_t offset); |
| 3012 | extern void setattr_copy(struct inode *inode, const struct iattr *attr); | 3012 | extern void setattr_copy(struct inode *inode, const struct iattr *attr); |
| 3013 | 3013 | ||