diff options
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 535721cc374a..4298d2dbafa3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -1435,8 +1435,7 @@ struct security_operations { | |||
| 1435 | struct dentry *new_dentry); | 1435 | struct dentry *new_dentry); |
| 1436 | int (*path_rename) (struct path *old_dir, struct dentry *old_dentry, | 1436 | int (*path_rename) (struct path *old_dir, struct dentry *old_dentry, |
| 1437 | struct path *new_dir, struct dentry *new_dentry); | 1437 | struct path *new_dir, struct dentry *new_dentry); |
| 1438 | int (*path_chmod) (struct dentry *dentry, struct vfsmount *mnt, | 1438 | int (*path_chmod) (struct path *path, umode_t mode); |
| 1439 | umode_t mode); | ||
| 1440 | int (*path_chown) (struct path *path, uid_t uid, gid_t gid); | 1439 | int (*path_chown) (struct path *path, uid_t uid, gid_t gid); |
| 1441 | int (*path_chroot) (struct path *path); | 1440 | int (*path_chroot) (struct path *path); |
| 1442 | #endif | 1441 | #endif |
| @@ -2866,8 +2865,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, | |||
| 2866 | struct dentry *new_dentry); | 2865 | struct dentry *new_dentry); |
| 2867 | int security_path_rename(struct path *old_dir, struct dentry *old_dentry, | 2866 | int security_path_rename(struct path *old_dir, struct dentry *old_dentry, |
| 2868 | struct path *new_dir, struct dentry *new_dentry); | 2867 | struct path *new_dir, struct dentry *new_dentry); |
| 2869 | int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, | 2868 | int security_path_chmod(struct path *path, umode_t mode); |
| 2870 | umode_t mode); | ||
| 2871 | int security_path_chown(struct path *path, uid_t uid, gid_t gid); | 2869 | int security_path_chown(struct path *path, uid_t uid, gid_t gid); |
| 2872 | int security_path_chroot(struct path *path); | 2870 | int security_path_chroot(struct path *path); |
| 2873 | #else /* CONFIG_SECURITY_PATH */ | 2871 | #else /* CONFIG_SECURITY_PATH */ |
| @@ -2919,9 +2917,7 @@ static inline int security_path_rename(struct path *old_dir, | |||
| 2919 | return 0; | 2917 | return 0; |
| 2920 | } | 2918 | } |
| 2921 | 2919 | ||
| 2922 | static inline int security_path_chmod(struct dentry *dentry, | 2920 | static inline int security_path_chmod(struct path *path, umode_t mode) |
| 2923 | struct vfsmount *mnt, | ||
| 2924 | umode_t mode) | ||
| 2925 | { | 2921 | { |
| 2926 | return 0; | 2922 | return 0; |
| 2927 | } | 2923 | } |
