From 18d8354a1d8ae018837c5935d552b2f9aa8c3dc4 Mon Sep 17 00:00:00 2001 From: Mister Oyster Date: Mon, 17 Apr 2017 00:02:20 +0200 Subject: vfs: add setattr2 fix merge --- include/linux/fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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) { -- cgit v1.2.3