diff --git a/cr-dump.c b/cr-dump.c index f6b8b4a02..6c3277809 100644 --- a/cr-dump.c +++ b/cr-dump.c @@ -817,7 +817,7 @@ static int get_children(struct pstree_item *item) goto free; } - ret = seize_task(pid, item->pid.real, &item->pgid, &item->sid); + ret = seize_task(pid, item->pid.real); if (ret < 0) { /* * Here is a race window between parse_children() and seize(), @@ -916,7 +916,7 @@ static int seize_threads(struct pstree_item *item, pr_info("\tSeizing %d's %d thread\n", item->pid.real, pid); - ret = seize_task(pid, item_ppid(item), NULL, NULL); + ret = seize_task(pid, item_ppid(item)); if (ret < 0) { /* * Here is a race window between parse_threads() and seize(), @@ -1078,7 +1078,7 @@ static int collect_pstree(pid_t pid) return -1; root_item->pid.real = pid; - ret = seize_task(pid, -1, &root_item->pgid, &root_item->sid); + ret = seize_task(pid, -1); if (ret < 0) goto err; pr_info("Seized task %d, state %d\n", pid, ret); diff --git a/cr-exec.c b/cr-exec.c index 362371101..9f6ebfe04 100644 --- a/cr-exec.c +++ b/cr-exec.c @@ -129,7 +129,7 @@ int cr_exec(int pid, char **opt) goto out; } - prev_state = ret = seize_task(pid, -1, NULL, NULL); + prev_state = ret = seize_task(pid, -1); if (ret < 0) { pr_err("Can't seize task %d\n", pid); goto out; diff --git a/include/ptrace.h b/include/ptrace.h index ecc63d34f..0d89788b3 100644 --- a/include/ptrace.h +++ b/include/ptrace.h @@ -62,7 +62,7 @@ struct ptrace_peeksiginfo_args { #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 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); diff --git a/ptrace.c b/ptrace.c index dc22ee415..dd7f13f4d 100644 --- a/ptrace.c +++ b/ptrace.c @@ -44,7 +44,7 @@ int unseize_task(pid_t pid, int orig_st, int st) * 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; int status; @@ -82,11 +82,6 @@ int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid) if (ret2 < 0) return -1; - if (pgid) - *pgid = ps.pgid; - if (sid) - *sid = ps.sid; - if (ret < 0) { if (ps.state != 'Z') { if (pid == getpid())