diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /security/capability.c | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/capability.c b/security/capability.c index a74fde6a7468..d68c57a62bcf 100644 --- a/security/capability.c +++ b/security/capability.c | |||
| @@ -343,9 +343,9 @@ static int cap_file_fcntl(struct file *file, unsigned int cmd, | |||
| 343 | return 0; | 343 | return 0; |
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | static int cap_file_set_fowner(struct file *file) | 346 | static void cap_file_set_fowner(struct file *file) |
| 347 | { | 347 | { |
| 348 | return 0; | 348 | return; |
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | static int cap_file_send_sigiotask(struct task_struct *tsk, | 351 | static int cap_file_send_sigiotask(struct task_struct *tsk, |