diff options
author | Eric Paris <eparis@redhat.com> | 2012-01-03 18:25:15 +0100 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2012-01-06 00:52:57 +0100 |
commit | 105ddf49cd301b7929a92f269440e8e562ef19db (patch) | |
tree | c292c794a322269b4963aa64ab484653cdf9c035 | |
parent | capabilites: introduce new has_ns_capabilities_noaudit (diff) | |
download | linux-105ddf49cd301b7929a92f269440e8e562ef19db.tar.xz linux-105ddf49cd301b7929a92f269440e8e562ef19db.zip |
capabilities: style only - move capable below ns_capable
Although the current code is fine for consistency this moves the capable
code below the function it calls in the c file. It doesn't actually change
code.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
-rw-r--r-- | kernel/capability.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index d8398e962470..5f99e5d68e1f 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -367,22 +367,6 @@ bool has_capability_noaudit(struct task_struct *t, int cap) } /** - * capable - Determine if the current task has a superior capability in effect - * @cap: The capability to be tested for - * - * Return true if the current task has the given superior capability currently - * available for use, false if not. - * - * This sets PF_SUPERPRIV on the task if the capability is available on the - * assumption that it's about to be used. - */ -bool capable(int cap) -{ - return ns_capable(&init_user_ns, cap); -} -EXPORT_SYMBOL(capable); - -/** * ns_capable - Determine if the current task has a superior capability in effect * @ns: The usernamespace we want the capability in * @cap: The capability to be tested for @@ -409,6 +393,22 @@ bool ns_capable(struct user_namespace *ns, int cap) EXPORT_SYMBOL(ns_capable); /** + * capable - Determine if the current task has a superior capability in effect + * @cap: The capability to be tested for + * + * Return true if the current task has the given superior capability currently + * available for use, false if not. + * + * This sets PF_SUPERPRIV on the task if the capability is available on the + * assumption that it's about to be used. + */ +bool capable(int cap) +{ + return ns_capable(&init_user_ns, cap); +} +EXPORT_SYMBOL(capable); + +/** * task_ns_capable - Determine whether current task has a superior * capability targeted at a specific task's user namespace. * @t: The task whose user namespace is targeted. |