diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 11:27:32 -0400 |
---|---|---|
committer | Jeff Layton <jlayton@primarydata.com> | 2014-09-09 16:01:36 -0400 |
commit | e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977 (patch) | |
tree | 97ceab83fdbfd3bf54fd8235a66da665fbcc83a7 /include/linux/security.h | |
parent | 1c994a0909a556508c2cc26ab5d9e13c5ce33aa0 (diff) |
security: make security_file_set_fowner, f_setown and __f_setown void return
security_file_set_fowner always returns 0, so make it f_setown and
__f_setown void return functions and fix up the error handling in the
callers.
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 623f90e5f38d..b10e7af95d3b 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1559,7 +1559,7 @@ struct security_operations { | |||
1559 | int (*file_lock) (struct file *file, unsigned int cmd); | 1559 | int (*file_lock) (struct file *file, unsigned int cmd); |
1560 | int (*file_fcntl) (struct file *file, unsigned int cmd, | 1560 | int (*file_fcntl) (struct file *file, unsigned int cmd, |
1561 | unsigned long arg); | 1561 | unsigned long arg); |
1562 | int (*file_set_fowner) (struct file *file); | 1562 | void (*file_set_fowner) (struct file *file); |
1563 | int (*file_send_sigiotask) (struct task_struct *tsk, | 1563 | int (*file_send_sigiotask) (struct task_struct *tsk, |
1564 | struct fown_struct *fown, int sig); | 1564 | struct fown_struct *fown, int sig); |
1565 | int (*file_receive) (struct file *file); | 1565 | int (*file_receive) (struct file *file); |
@@ -1834,7 +1834,7 @@ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, | |||
1834 | unsigned long prot); | 1834 | unsigned long prot); |
1835 | int security_file_lock(struct file *file, unsigned int cmd); | 1835 | int security_file_lock(struct file *file, unsigned int cmd); |
1836 | int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg); | 1836 | int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg); |
1837 | int security_file_set_fowner(struct file *file); | 1837 | void security_file_set_fowner(struct file *file); |
1838 | int security_file_send_sigiotask(struct task_struct *tsk, | 1838 | int security_file_send_sigiotask(struct task_struct *tsk, |
1839 | struct fown_struct *fown, int sig); | 1839 | struct fown_struct *fown, int sig); |
1840 | int security_file_receive(struct file *file); | 1840 | int security_file_receive(struct file *file); |
@@ -2312,9 +2312,9 @@ static inline int security_file_fcntl(struct file *file, unsigned int cmd, | |||
2312 | return 0; | 2312 | return 0; |
2313 | } | 2313 | } |
2314 | 2314 | ||
2315 | static inline int security_file_set_fowner(struct file *file) | 2315 | static inline void security_file_set_fowner(struct file *file) |
2316 | { | 2316 | { |
2317 | return 0; | 2317 | return; |
2318 | } | 2318 | } |
2319 | 2319 | ||
2320 | static inline int security_file_send_sigiotask(struct task_struct *tsk, | 2320 | static inline int security_file_send_sigiotask(struct task_struct *tsk, |