From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759451AbZE1Llh (ORCPT ); Thu, 28 May 2009 07:41:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755301AbZE1Lka (ORCPT ); Thu, 28 May 2009 07:40:30 -0400 Received: from mx2.redhat.com ([66.187.237.31]:57803 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758194AbZE1Lk1 (ORCPT ); Thu, 28 May 2009 07:40:27 -0400 Date: Thu, 28 May 2009 13:35:47 +0200 From: Oleg Nesterov To: Roland McGrath Cc: Christoph Hellwig , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [RFC PATCH 5/12 v2] ptrace: kill the now unneeded args from tracehook_finish_clone() path Message-ID: <20090528113547.GA18699@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the previous change tracehook_finish_clone() and ptrace_init_task() do not need any arguments except "child", remove them. include/linux/ptrace.h | 7 +++---- include/linux/tracehook.h | 10 +++------- kernel/fork.c | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) --- PTRACE/include/linux/ptrace.h~4_FORK_TRACE 2009-05-28 07:26:35.000000000 +0200 +++ PTRACE/include/linux/ptrace.h 2009-05-28 08:19:16.000000000 +0200 @@ -162,20 +162,19 @@ static inline int ptrace_event(int mask, /** * ptrace_init_task - initialize ptrace state for a new child * @child: new child task - * @ptrace: true if child should be ptrace'd by parent's tracer * * This is called immediately after adding @child to its parent's children - * list. @ptrace is false in the normal case, and true to ptrace @child. + * list. * * Called with current's siglock and write_lock_irq(&tasklist_lock) held. */ -static inline void ptrace_init_task(struct task_struct *child, bool ptrace) +static inline void ptrace_init_task(struct task_struct *child) { INIT_LIST_HEAD(&child->ptrace_entry); INIT_LIST_HEAD(&child->ptraced); child->parent = child->real_parent; child->ptrace = 0; - if (unlikely(ptrace)) { + if (unlikely(child->ptrace_ctx)) { child->ptrace = current->ptrace; ptrace_link(child, current->parent); } --- PTRACE/include/linux/tracehook.h~4_FORK_TRACE 2009-05-28 07:39:21.000000000 +0200 +++ PTRACE/include/linux/tracehook.h 2009-05-28 08:19:16.000000000 +0200 @@ -219,7 +219,7 @@ static inline void tracehook_report_exit * @clone_flags: %CLONE_* flags from clone/fork/vfork system call * * This is called before a new user task is to be cloned. - * Its return value will be passed to tracehook_finish_clone(). + * Its return value will be passed to tracehook_init_task(). * * Called with no locks held. */ @@ -279,18 +279,14 @@ static inline void tracehook_free_task(s /** * tracehook_finish_clone - new child created and being attached * @child: new child task - * @clone_flags: %CLONE_* flags from clone/fork/vfork system call - * @trace: return value from tracehook_prepare_clone() * * This is called immediately after adding @child to its parent's children list. - * The @trace value is that returned by tracehook_prepare_clone(). * * Called with current's siglock and write_lock_irq(&tasklist_lock) held. */ -static inline void tracehook_finish_clone(struct task_struct *child, - unsigned long clone_flags, int trace) +static inline void tracehook_finish_clone(struct task_struct *child) { - ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace); + ptrace_init_task(child); } /** --- PTRACE/kernel/fork.c~4_FORK_TRACE 2009-05-28 07:26:35.000000000 +0200 +++ PTRACE/kernel/fork.c 2009-05-28 08:19:16.000000000 +0200 @@ -1247,7 +1247,7 @@ static struct task_struct *copy_process( if (likely(p->pid)) { list_add_tail(&p->sibling, &p->real_parent->children); - tracehook_finish_clone(p, clone_flags, trace); + tracehook_finish_clone(p); if (thread_group_leader(p)) { if (clone_flags & CLONE_NEWPID)