[CRIU] [PATCH 2/3] rst: Remove actually unused pid arg from restore_one_zombie

Pavel Emelyanov xemul at parallels.com
Thu Jun 25 13:42:43 PDT 2015


Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 cr-restore.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-restore.c b/cr-restore.c
index fb58a37..1db9c50 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -883,7 +883,7 @@ static inline int sig_fatal(int sig)
 struct task_entries *task_entries;
 static unsigned long task_entries_pos;
 
-static int restore_one_zombie(int pid, CoreEntry *core)
+static int restore_one_zombie(CoreEntry *core)
 {
 	int exit_code = core->tc->exit_code;
 
@@ -913,7 +913,7 @@ static int restore_one_zombie(int pid, CoreEntry *core)
 			signr = SIGABRT;
 		}
 
-		if (kill(pid, signr) < 0)
+		if (kill(current->pid.virt, signr) < 0)
 			pr_perror("Can't kill myself, will just exit");
 
 		exit_code = 0;
@@ -966,7 +966,7 @@ static int restore_one_task(int pid, CoreEntry *core)
 	if (task_alive(current))
 		ret = restore_one_alive_task(pid, core);
 	else if (current->state == TASK_DEAD)
-		ret = restore_one_zombie(pid, core);
+		ret = restore_one_zombie(core);
 	else if (current->state == TASK_HELPER) {
 		restore_finish_stage(CR_STATE_RESTORE);
 		ret = 0;
-- 
1.9.3



More information about the CRIU mailing list