[PATCH] kill unushed __put_task_struct_cb (64541d19) · Commits · 戴 / test

Somehow in the midst of dotting i's and crossing t's during the merge up to rc1 we wound up keeping __put_task_struct_cb when it should have been killed as it no longer has any users. Sorry I probably should have caught this while it was still in the -mm tree. Having the old code there gets confusing when reading through the code and trying to understand what is happening. Signed-off-by:

Eric W. Biederman <ebiederm@xmission.com> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

include/linux/sched.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -911,7 +911,6 @@ static inline int pid_alive(struct task_struct *p)
		extern void free_task(struct task_struct *tsk);
		#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)

		extern void __put_task_struct_cb(struct rcu_head *rhp);
		extern void __put_task_struct(struct task_struct *t);

		static inline void put_task_struct(struct task_struct *t)

kernel/fork.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -124,12 +124,6 @@ void __put_task_struct(struct task_struct *tsk)
		free_task(tsk);
		}

		void __put_task_struct_cb(struct rcu_head *rhp)
		{
		struct task_struct *tsk = container_of(rhp, struct task_struct, rcu);
		__put_task_struct(tsk);
		}

		void __init fork_init(unsigned long mempages)
		{
		#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR

Admin message