diff options
| author | Al Viro | 2016-10-08 11:06:08 -0400 |
|---|---|---|
| committer | Al Viro | 2016-10-08 11:06:08 -0400 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /include | |
| parent | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (diff) | |
| parent | 030b533c4fd4d2ec3402363323de4bb2983c9cee (diff) | |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/posix_acl.h | 1 |
2 files changed, 2 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 *, #define buffer_migrate_page NULL #endif -extern int inode_change_ok(const struct inode *, struct iattr *); +extern int setattr_prepare(struct dentry *, struct iattr *); extern int inode_newsize_ok(const struct inode *, loff_t offset); extern void setattr_copy(struct inode *inode, const struct iattr *attr); diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h index 5433eea8e97c..5a9a739acdd5 100644 --- a/include/linux/posix_acl.h +++ b/include/linux/posix_acl.h @@ -73,6 +73,7 @@ extern int set_posix_acl(struct inode *, int, struct posix_acl *); extern int posix_acl_chmod(struct inode *, umode_t); extern int posix_acl_create(struct inode *, umode_t *, struct posix_acl **, struct posix_acl **); +extern int posix_acl_update_mode(struct inode *, umode_t *, struct posix_acl **); extern int simple_set_acl(struct inode *, struct posix_acl *, int); extern int simple_acl_create(struct inode *, struct inode *); |