[CRIU] [PATCH] restore: die properly if restore_one_task fails
Tycho Andersen
tycho.andersen at canonical.com
Thu Aug 28 11:14:51 PDT 2014
This is really just the last bit of c32046c9; if restore_one_task() fails, we
need to do the same futex wakeup we do everywhere else in this function.
Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
cr-restore.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cr-restore.c b/cr-restore.c
index cefa78e..ec4b648 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -1467,7 +1467,10 @@ static int restore_task_with_children(void *_arg)
if (current->parent == NULL && fini_mnt_ns())
goto err_fini_mnt;
- return restore_one_task(current->pid.virt, ca->core);
+ if (restore_one_task(current->pid.virt, ca->core))
+ goto err_fini_mnt;
+
+ return 0;
err_fini_mnt:
if (current->parent == NULL)
--
1.9.1
More information about the CRIU
mailing list