Commit 2f2a3a46 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds
Browse files

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: default avatarPavel 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8990571e

include/linux/sched.h

+4 −20
Original line number Diff line number Diff line
@@ -1243,11 +1243,7 @@ static inline pid_t task_pid_nr(struct task_struct *tsk) 
	return tsk->pid;

}



static inline pid_t task_pid_nr_ns(struct task_struct *tsk,

		struct pid_namespace *ns)

{

	return pid_nr_ns(task_pid(tsk), ns);

}

pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);



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;

}



static inline pid_t task_tgid_nr_ns(struct task_struct *tsk,

		struct pid_namespace *ns)

{

	return pid_nr_ns(task_tgid(tsk), ns);

}

pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);



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;

}



static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk,

		struct pid_namespace *ns)

{

	return pid_nr_ns(task_pgrp(tsk), ns);

}

pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);



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;

}



static inline pid_t task_session_nr_ns(struct task_struct *tsk,

		struct pid_namespace *ns)

{

	return pid_nr_ns(task_session(tsk), ns);

}

pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);



static inline pid_t task_session_vnr(struct task_struct *tsk)

{

kernel/pid.c

+24 −0
Original line number Diff line number Diff line
@@ -443,6 +443,30 @@ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns) 
	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.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE