diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2010-06-02 00:24:43 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-08-02 01:33:40 -0400 |
commit | ea0d3ab239fba48d6e998b19c28d78f765963007 (patch) | |
tree | c1e20273bf121a4f404ca7ac2a012161b0e0201e /include | |
parent | 3e62cbb8436f6c0cb799c8b7f106de7f662a7b8d (diff) |
LSM: Remove unused arguments from security_path_truncate().
When commit be6d3e56a6b9b3a4ee44a0685e39e595073c6f0d "introduce new LSM hooks
where vfsmount is available." was proposed, regarding security_path_truncate(),
only "struct file *" argument (which AppArmor wanted to use) was removed.
But length and time_attrs arguments are not used by TOMOYO nor AppArmor.
Thus, let's remove these arguments.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/security.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 0c8819170463..723a93df756a 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -470,8 +470,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
470 | * @path_truncate: | 470 | * @path_truncate: |
471 | * Check permission before truncating a file. | 471 | * Check permission before truncating a file. |
472 | * @path contains the path structure for the file. | 472 | * @path contains the path structure for the file. |
473 | * @length is the new length of the file. | ||
474 | * @time_attrs is the flags passed to do_truncate(). | ||
475 | * Return 0 if permission is granted. | 473 | * Return 0 if permission is granted. |
476 | * @inode_getattr: | 474 | * @inode_getattr: |
477 | * Check permission before obtaining file attributes. | 475 | * Check permission before obtaining file attributes. |
@@ -1412,8 +1410,7 @@ struct security_operations { | |||
1412 | int (*path_rmdir) (struct path *dir, struct dentry *dentry); | 1410 | int (*path_rmdir) (struct path *dir, struct dentry *dentry); |
1413 | int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode, | 1411 | int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode, |
1414 | unsigned int dev); | 1412 | unsigned int dev); |
1415 | int (*path_truncate) (struct path *path, loff_t length, | 1413 | int (*path_truncate) (struct path *path); |
1416 | unsigned int time_attrs); | ||
1417 | int (*path_symlink) (struct path *dir, struct dentry *dentry, | 1414 | int (*path_symlink) (struct path *dir, struct dentry *dentry, |
1418 | const char *old_name); | 1415 | const char *old_name); |
1419 | int (*path_link) (struct dentry *old_dentry, struct path *new_dir, | 1416 | int (*path_link) (struct dentry *old_dentry, struct path *new_dir, |
@@ -2806,8 +2803,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode); | |||
2806 | int security_path_rmdir(struct path *dir, struct dentry *dentry); | 2803 | int security_path_rmdir(struct path *dir, struct dentry *dentry); |
2807 | int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, | 2804 | int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, |
2808 | unsigned int dev); | 2805 | unsigned int dev); |
2809 | int security_path_truncate(struct path *path, loff_t length, | 2806 | int security_path_truncate(struct path *path); |
2810 | unsigned int time_attrs); | ||
2811 | int security_path_symlink(struct path *dir, struct dentry *dentry, | 2807 | int security_path_symlink(struct path *dir, struct dentry *dentry, |
2812 | const char *old_name); | 2808 | const char *old_name); |
2813 | int security_path_link(struct dentry *old_dentry, struct path *new_dir, | 2809 | int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
@@ -2841,8 +2837,7 @@ static inline int security_path_mknod(struct path *dir, struct dentry *dentry, | |||
2841 | return 0; | 2837 | return 0; |
2842 | } | 2838 | } |
2843 | 2839 | ||
2844 | static inline int security_path_truncate(struct path *path, loff_t length, | 2840 | static inline int security_path_truncate(struct path *path) |
2845 | unsigned int time_attrs) | ||
2846 | { | 2841 | { |
2847 | return 0; | 2842 | return 0; |
2848 | } | 2843 | } |