diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2009-12-15 16:47:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 07:20:08 -0800 |
| commit | c6a47cc2ccf9649ee09eeddd70a6d061bde69568 (patch) | |
| tree | b5ff696302607cd8f325199f84f88448e6475b84 /include/linux | |
| parent | aa20d489ceb024f91aae084ee00c47fc6a12255c (diff) | |
| download | linux-exynos-c6a47cc2ccf9649ee09eeddd70a6d061bde69568.tar.gz linux-exynos-c6a47cc2ccf9649ee09eeddd70a6d061bde69568.tar.bz2 linux-exynos-c6a47cc2ccf9649ee09eeddd70a6d061bde69568.zip | |
ptrace: cleanup ptrace_init_task()->ptrace_link() path
No functional changes.
ptrace_init_task() looks confusing, as if we always auto-attach when "bool
ptrace" argument is true, while in fact we attach only if current is
traced.
Make the code more explicit and kill now unused ptrace_link().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ptrace.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 7456d7d87a19..1951805df63a 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -105,12 +105,7 @@ static inline int ptrace_reparented(struct task_struct *child) { return child->real_parent != child->parent; } -static inline void ptrace_link(struct task_struct *child, - struct task_struct *new_parent) -{ - if (unlikely(child->ptrace)) - __ptrace_link(child, new_parent); -} + static inline void ptrace_unlink(struct task_struct *child) { if (unlikely(child->ptrace)) @@ -169,9 +164,9 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace) INIT_LIST_HEAD(&child->ptraced); child->parent = child->real_parent; child->ptrace = 0; - if (unlikely(ptrace)) { + if (unlikely(ptrace) && (current->ptrace & PT_PTRACED)) { child->ptrace = current->ptrace; - ptrace_link(child, current->parent); + __ptrace_link(child, current->parent); } } |