Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/capability.c

+16 −16
Original line number Diff line number Diff line
@@ -366,22 +366,6 @@ bool has_capability_noaudit(struct task_struct *t, int 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:  The usernamespace we want the capability in
@@ -408,6 +392,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.