diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-19 02:40:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:40 -0400 |
commit | 228ebcbe634a30aec35132ea4375721bcc41bec0 (patch) | |
tree | a875976fd5bde6e2f931aa235c34c88a2738493f /kernel/capability.c | |
parent | b488893a390edfe027bae7a46e9af8083e740668 (diff) |
Uninline find_task_by_xxx set of functions
The find_task_by_something is a set of macros are used to find task by pid
depending on what kind of pid is proposed - global or virtual one. All of
them are wrappers above the most generic one - find_task_by_pid_type_ns() -
and just substitute some args for it.
It turned out, that dereferencing the current->nsproxy->pid_ns construction
and pushing one more argument on the stack inline cause kernel text size to
grow.
This patch moves all this stuff out-of-line into kernel/pid.c. Together
with the next patch it saves a bit less than 400 bytes from the .text
section.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
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, 2 insertions, 4 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index d4377c5a36c9..0d0d886d1e84 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
@@ -63,8 +63,7 @@ asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr) | |||
63 | read_lock(&tasklist_lock); | 63 | read_lock(&tasklist_lock); |
64 | 64 | ||
65 | if (pid && pid != task_pid_vnr(current)) { | 65 | if (pid && pid != task_pid_vnr(current)) { |
66 | target = find_task_by_pid_ns(pid, | 66 | target = find_task_by_vpid(pid); |
67 | current->nsproxy->pid_ns); | ||
68 | if (!target) { | 67 | if (!target) { |
69 | ret = -ESRCH; | 68 | ret = -ESRCH; |
70 | goto out; | 69 | goto out; |
@@ -198,8 +197,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data) | |||
198 | read_lock(&tasklist_lock); | 197 | read_lock(&tasklist_lock); |
199 | 198 | ||
200 | if (pid > 0 && pid != task_pid_vnr(current)) { | 199 | if (pid > 0 && pid != task_pid_vnr(current)) { |
201 | target = find_task_by_pid_ns(pid, | 200 | target = find_task_by_vpid(pid); |
202 | current->nsproxy->pid_ns); | ||
203 | if (!target) { | 201 | if (!target) { |
204 | ret = -ESRCH; | 202 | ret = -ESRCH; |
205 | goto out; | 203 | goto out; |