diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-04-17 00:02:20 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-17 00:30:28 +0200 |
| commit | 18d8354a1d8ae018837c5935d552b2f9aa8c3dc4 (patch) | |
| tree | 488034ccc55275eca53cd7dc974b032cceaf09b0 /include | |
| parent | 10be2cc22f7703f7f79f7960f3093f57084d890b (diff) | |
vfs: add setattr2 fix merge
Diffstat (limited to 'include')
| -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 60bdc669b..8262b5403 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2264,8 +2264,8 @@ extern sector_t bmap(struct inode *, sector_t); extern int notify_change(struct dentry *, struct iattr *); extern int notify_change2(struct vfsmount *, struct dentry *, struct iattr *); extern int inode_permission(struct inode *, int); -extern int generic_permission(struct inode *, int); extern int inode_permission2(struct vfsmount *, struct inode *, int); +extern int generic_permission(struct inode *, int); static inline bool execute_ok(struct inode *inode) { |