Uninline the task_xid_nr_ns() calls
Since these are expanded into call to pid_nr_ns() anyway, it's OK to move the whole routine out-of-line. This is a cheap way to save ~100 bytes from vmlinux. Together with the previous two patches, it saves half-a-kilo from the vmlinux. Un-inline other (currently inlined) functions must be done with additional performance testing. 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
8990571eb5
commit
2f2a3a46fc
2 changed files with 28 additions and 20 deletions
|
@ -1243,11 +1243,7 @@ static inline pid_t task_pid_nr(struct task_struct *tsk)
|
||||||
return tsk->pid;
|
return tsk->pid;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline pid_t task_pid_nr_ns(struct task_struct *tsk,
|
pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
|
||||||
struct pid_namespace *ns)
|
|
||||||
{
|
|
||||||
return pid_nr_ns(task_pid(tsk), ns);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pid_t task_pid_vnr(struct task_struct *tsk)
|
static inline pid_t task_pid_vnr(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
|
@ -1260,11 +1256,7 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk)
|
||||||
return tsk->tgid;
|
return tsk->tgid;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline pid_t task_tgid_nr_ns(struct task_struct *tsk,
|
pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
|
||||||
struct pid_namespace *ns)
|
|
||||||
{
|
|
||||||
return pid_nr_ns(task_tgid(tsk), ns);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
|
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
|
@ -1277,11 +1269,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
|
||||||
return tsk->signal->pgrp;
|
return tsk->signal->pgrp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk,
|
pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
|
||||||
struct pid_namespace *ns)
|
|
||||||
{
|
|
||||||
return pid_nr_ns(task_pgrp(tsk), ns);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pid_t task_pgrp_vnr(struct task_struct *tsk)
|
static inline pid_t task_pgrp_vnr(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
|
@ -1294,11 +1282,7 @@ static inline pid_t task_session_nr(struct task_struct *tsk)
|
||||||
return tsk->signal->__session;
|
return tsk->signal->__session;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline pid_t task_session_nr_ns(struct task_struct *tsk,
|
pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
|
||||||
struct pid_namespace *ns)
|
|
||||||
{
|
|
||||||
return pid_nr_ns(task_session(tsk), ns);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pid_t task_session_vnr(struct task_struct *tsk)
|
static inline pid_t task_session_vnr(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
|
|
24
kernel/pid.c
24
kernel/pid.c
|
@ -443,6 +443,30 @@ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
|
||||||
return nr;
|
return nr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
|
||||||
|
{
|
||||||
|
return pid_nr_ns(task_pid(tsk), ns);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(task_pid_nr_ns);
|
||||||
|
|
||||||
|
pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
|
||||||
|
{
|
||||||
|
return pid_nr_ns(task_tgid(tsk), ns);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(task_tgid_nr_ns);
|
||||||
|
|
||||||
|
pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
|
||||||
|
{
|
||||||
|
return pid_nr_ns(task_pgrp(tsk), ns);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(task_pgrp_nr_ns);
|
||||||
|
|
||||||
|
pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
|
||||||
|
{
|
||||||
|
return pid_nr_ns(task_session(tsk), ns);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(task_session_nr_ns);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Used by proc to find the first pid that is greater then or equal to nr.
|
* Used by proc to find the first pid that is greater then or equal to nr.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Reference in a new issue