diff options
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 9 | 
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 31c8851ec5d0..fd96e7f8a6f9 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -102,9 +102,7 @@ extern unsigned long mmap_min_addr;  #define LSM_SETID_FS	8  /* forward declares to avoid warnings */ -struct nfsctl_arg;  struct sched_param; -struct swap_info_struct;  struct request_sock;  /* bprm_apply_creds unsafe reasons */ @@ -1364,7 +1362,7 @@ struct security_operations {  			     struct inode *new_dir, struct dentry *new_dentry);  	int (*inode_readlink) (struct dentry *dentry);  	int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd); -	int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd); +	int (*inode_permission) (struct inode *inode, int mask);  	int (*inode_setattr)	(struct dentry *dentry, struct iattr *attr);  	int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);  	void (*inode_delete) (struct inode *inode); @@ -1630,7 +1628,7 @@ int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,  			  struct inode *new_dir, struct dentry *new_dentry);  int security_inode_readlink(struct dentry *dentry);  int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd); -int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd); +int security_inode_permission(struct inode *inode, int mask);  int security_inode_setattr(struct dentry *dentry, struct iattr *attr);  int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry);  void security_inode_delete(struct inode *inode); @@ -2023,8 +2021,7 @@ static inline int security_inode_follow_link(struct dentry *dentry,  	return 0;  } -static inline int security_inode_permission(struct inode *inode, int mask, -					     struct nameidata *nd) +static inline int security_inode_permission(struct inode *inode, int mask)  {  	return 0;  }  |