Commit 105ddf49 authored by Eric Paris's avatar Eric Paris

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: default avatarEric Paris <eparis@redhat.com>
Acked-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
parent 7b61d648
...@@ -366,22 +366,6 @@ bool has_capability_noaudit(struct task_struct *t, int cap) ...@@ -366,22 +366,6 @@ bool has_capability_noaudit(struct task_struct *t, int cap)
return has_ns_capability_noaudit(t, &init_user_ns, cap); return has_ns_capability_noaudit(t, &init_user_ns, 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_capable - Determine if the current task has a superior capability in effect
* @ns: The usernamespace we want the capability in * @ns: The usernamespace we want the capability in
...@@ -408,6 +392,22 @@ bool ns_capable(struct user_namespace *ns, int cap) ...@@ -408,6 +392,22 @@ bool ns_capable(struct user_namespace *ns, int cap)
} }
EXPORT_SYMBOL(ns_capable); 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 * task_ns_capable - Determine whether current task has a superior
* capability targeted at a specific task's user namespace. * capability targeted at a specific task's user namespace.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment