Commit 2cb6f2b6 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

dump: remove useless arguments from seize_task()

We get sig and pgid from a parasite, because we need to get
them from a target pid namespace.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 77905aae
...@@ -817,7 +817,7 @@ static int get_children(struct pstree_item *item) ...@@ -817,7 +817,7 @@ static int get_children(struct pstree_item *item)
goto free; goto free;
} }
ret = seize_task(pid, item->pid.real, &item->pgid, &item->sid); ret = seize_task(pid, item->pid.real);
if (ret < 0) { if (ret < 0) {
/* /*
* Here is a race window between parse_children() and seize(), * Here is a race window between parse_children() and seize(),
...@@ -916,7 +916,7 @@ static int seize_threads(struct pstree_item *item, ...@@ -916,7 +916,7 @@ static int seize_threads(struct pstree_item *item,
pr_info("\tSeizing %d's %d thread\n", pr_info("\tSeizing %d's %d thread\n",
item->pid.real, pid); item->pid.real, pid);
ret = seize_task(pid, item_ppid(item), NULL, NULL); ret = seize_task(pid, item_ppid(item));
if (ret < 0) { if (ret < 0) {
/* /*
* Here is a race window between parse_threads() and seize(), * Here is a race window between parse_threads() and seize(),
...@@ -1078,7 +1078,7 @@ static int collect_pstree(pid_t pid) ...@@ -1078,7 +1078,7 @@ static int collect_pstree(pid_t pid)
return -1; return -1;
root_item->pid.real = pid; root_item->pid.real = pid;
ret = seize_task(pid, -1, &root_item->pgid, &root_item->sid); ret = seize_task(pid, -1);
if (ret < 0) if (ret < 0)
goto err; goto err;
pr_info("Seized task %d, state %d\n", pid, ret); pr_info("Seized task %d, state %d\n", pid, ret);
......
...@@ -129,7 +129,7 @@ int cr_exec(int pid, char **opt) ...@@ -129,7 +129,7 @@ int cr_exec(int pid, char **opt)
goto out; goto out;
} }
prev_state = ret = seize_task(pid, -1, NULL, NULL); prev_state = ret = seize_task(pid, -1);
if (ret < 0) { if (ret < 0) {
pr_err("Can't seize task %d\n", pid); pr_err("Can't seize task %d\n", pid);
goto out; goto out;
......
...@@ -62,7 +62,7 @@ struct ptrace_peeksiginfo_args { ...@@ -62,7 +62,7 @@ struct ptrace_peeksiginfo_args {
#define SI_EVENT(_si_code) (((_si_code) & 0xFFFF) >> 8) #define SI_EVENT(_si_code) (((_si_code) & 0xFFFF) >> 8)
extern int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid); extern int seize_task(pid_t pid, pid_t ppid);
extern int unseize_task(pid_t pid, int orig_state, int state); extern int unseize_task(pid_t pid, int orig_state, int state);
extern int ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes); extern int ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes);
extern int ptrace_poke_area(pid_t pid, void *src, void *addr, long bytes); extern int ptrace_poke_area(pid_t pid, void *src, void *addr, long bytes);
......
...@@ -44,7 +44,7 @@ int unseize_task(pid_t pid, int orig_st, int st) ...@@ -44,7 +44,7 @@ int unseize_task(pid_t pid, int orig_st, int st)
* up with someone else. * up with someone else.
*/ */
int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid) int seize_task(pid_t pid, pid_t ppid)
{ {
siginfo_t si; siginfo_t si;
int status; int status;
...@@ -82,11 +82,6 @@ int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid) ...@@ -82,11 +82,6 @@ int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid)
if (ret2 < 0) if (ret2 < 0)
return -1; return -1;
if (pgid)
*pgid = ps.pgid;
if (sid)
*sid = ps.sid;
if (ret < 0) { if (ret < 0) {
if (ps.state != 'Z') { if (ps.state != 'Z') {
if (pid == getpid()) if (pid == getpid())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment