[PATCH 107] cosmetic, introduce ptrace_resume_action()
Oleg Nesterov
oleg at redhat.com
Tue Oct 20 16:15:27 UTC 2009
No functional changes.
Move the "switch (request)" code from ptrace_resume() into the new
helper, ptrace_resume_action().
---
kernel/ptrace.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
--- PU/kernel/ptrace.c~107_PTRACE_RESUME_ACTION 2009-10-20 17:22:27.000000000 +0200
+++ PU/kernel/ptrace.c 2009-10-20 17:55:20.000000000 +0200
@@ -1017,15 +1017,12 @@ static void do_ptrace_resume(struct utra
ptrace_wake_up(tracee, engine, action, true);
}
-static int ptrace_resume(struct utrace_engine *engine,
- struct task_struct *tracee, long request, long data)
+static int ptrace_resume_action(struct task_struct *tracee,
+ struct utrace_engine *engine, long request)
{
struct ptrace_context *context = ptrace_context(engine);
- enum utrace_resume_action action;
unsigned long events;
-
- if (!valid_signal(data))
- return -EIO;
+ int action;
context->options &= ~PTRACE_O_SYSEMU;
events = engine->flags & ~UTRACE_EVENT_SYSCALL;
@@ -1065,9 +1062,24 @@ static int ptrace_resume(struct utrace_e
}
if (events != engine->flags &&
- utrace_set_events(tracee, engine, events))
+ utrace_set_events(tracee, engine, events))
return -ESRCH;
+ return action;
+}
+
+static int ptrace_resume(struct utrace_engine *engine,
+ struct task_struct *tracee, long request, long data)
+{
+ int action;
+
+ if (!valid_signal(data))
+ return -EIO;
+
+ action = ptrace_resume_action(tracee, engine, request);
+ if (action < 0)
+ return action;
+
do_ptrace_resume(engine, tracee, action, request, data);
return 0;
}
More information about the utrace-devel
mailing list