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

Commit 7a36094d authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

pids: Compute task_tgid using signal->leader_pid 



The cost is the the same and this removes the need
to worry about complications that come from de_thread
and group_leader changing.

__task_pid_nr_ns has been updated to take advantage of this change.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 1fb53567

arch/ia64/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ void foo(void) 


	DEFINE(IA64_TASK_BLOCKED_OFFSET,offsetof (struct task_struct, blocked));

	DEFINE(IA64_TASK_CLEAR_CHILD_TID_OFFSET,offsetof (struct task_struct, clear_child_tid));

	DEFINE(IA64_TASK_GROUP_LEADER_OFFSET, offsetof (struct task_struct, group_leader));

	DEFINE(IA64_TASK_TGIDLINK_OFFSET, offsetof (struct task_struct, pids[PIDTYPE_PID].pid));

	DEFINE(IA64_PID_LEVEL_OFFSET, offsetof (struct pid, level));

	DEFINE(IA64_PID_UPID_OFFSET, offsetof (struct pid, numbers[0]));
@@ -68,6 +67,7 @@ void foo(void) 
	DEFINE(IA64_SIGNAL_GROUP_STOP_COUNT_OFFSET,offsetof (struct signal_struct,

							     group_stop_count));

	DEFINE(IA64_SIGNAL_SHARED_PENDING_OFFSET,offsetof (struct signal_struct, shared_pending));

	DEFINE(IA64_SIGNAL_LEADER_PID_OFFSET, offsetof (struct signal_struct, leader_pid));



	BLANK();

arch/ia64/kernel/fsys.S

+4 −4
Original line number Diff line number Diff line
@@ -62,16 +62,16 @@ ENTRY(fsys_getpid) 
	.prologue

	.altrp b6

	.body

	add r17=IA64_TASK_GROUP_LEADER_OFFSET,r16

	add r17=IA64_TASK_SIGNAL_OFFSET,r16

	;;

	ld8 r17=[r17]				// r17 = current->group_leader

	ld8 r17=[r17]				// r17 = current->signal

	add r9=TI_FLAGS+IA64_TASK_SIZE,r16

	;;

	ld4 r9=[r9]

	add r17=IA64_TASK_TGIDLINK_OFFSET,r17

	add r17=IA64_SIGNAL_LEADER_PID_OFFSET,r17

	;;

	and r9=TIF_ALLWORK_MASK,r9

	ld8 r17=[r17]				// r17 = current->group_leader->pids[PIDTYPE_PID].pid

	ld8 r17=[r17]				// r17 = current->signal->leader_pid

	;;

	add r8=IA64_PID_LEVEL_OFFSET,r17

	;;

drivers/platform/x86/thinkpad_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/list.h>

#include <linux/mutex.h>

#include <linux/sched.h>

#include <linux/sched/signal.h>

#include <linux/kthread.h>

#include <linux/freezer.h>

#include <linux/delay.h>

fs/fuse/file.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/slab.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/sched/signal.h>

#include <linux/module.h>

#include <linux/compat.h>

#include <linux/swap.h>

fs/notify/fanotify/fanotify.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/mount.h>

#include <linux/sched.h>

#include <linux/sched/user.h>

#include <linux/sched/signal.h>

#include <linux/types.h>

#include <linux/wait.h>

#include <linux/audit.h>