diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-04 19:11:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:15 -0400 |
commit | a6c8c6902c53e620e607e83f520e9ae424e2a424 (patch) | |
tree | b350abe22fbedb3d9a924f6709ad01f30d418430 /kernel/capability.c | |
parent | 462b29b8564c489e0aa3f5a3a505fd2776af5e55 (diff) |
kernel/capability.c: code clean-up
- EXPORT_SYMBOL
- typo: unexpectidly->unexpectedly
- function prototype over 80 characters
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/capability.c')
-rw-r--r-- | kernel/capability.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index a8d63df0c322..84b2bbf443e7 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
@@ -24,7 +24,6 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET; | 26 | const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET; |
27 | |||
28 | EXPORT_SYMBOL(__cap_empty_set); | 27 | EXPORT_SYMBOL(__cap_empty_set); |
29 | 28 | ||
30 | int file_caps_enabled = 1; | 29 | int file_caps_enabled = 1; |
@@ -189,7 +188,7 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr) | |||
189 | * | 188 | * |
190 | * An alternative would be to return an error here | 189 | * An alternative would be to return an error here |
191 | * (-ERANGE), but that causes legacy applications to | 190 | * (-ERANGE), but that causes legacy applications to |
192 | * unexpectidly fail; the capget/modify/capset aborts | 191 | * unexpectedly fail; the capget/modify/capset aborts |
193 | * before modification is attempted and the application | 192 | * before modification is attempted and the application |
194 | * fails. | 193 | * fails. |
195 | */ | 194 | */ |
@@ -395,7 +394,8 @@ EXPORT_SYMBOL(ns_capable); | |||
395 | * This does not set PF_SUPERPRIV because the caller may not | 394 | * This does not set PF_SUPERPRIV because the caller may not |
396 | * actually be privileged. | 395 | * actually be privileged. |
397 | */ | 396 | */ |
398 | bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap) | 397 | bool file_ns_capable(const struct file *file, struct user_namespace *ns, |
398 | int cap) | ||
399 | { | 399 | { |
400 | if (WARN_ON_ONCE(!cap_valid(cap))) | 400 | if (WARN_ON_ONCE(!cap_valid(cap))) |
401 | return false; | 401 | return false; |