[Devel,criu,1/6] Revert "vz7: Add ACT_POST_SIGRETURN"

Submitted by Cyrill Gorcunov on Feb. 7, 2017, 9:05 p.m.

Details

Message ID 1486501541-20795-2-git-send-email-gorcunov@virtuozzo.com
State New
Series "Rework memory limits restore"
Headers show

Commit Message

Cyrill Gorcunov Feb. 7, 2017, 9:05 p.m.
This reverts commit 7b111aba8c3e5c3e88f9642ea0548b117397b2e7.

Instead "pre-resume" action will be used to share same code
as in vanilla CRIU

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
 criu/action-scripts.c         | 1 -
 criu/cr-restore.c             | 4 ----
 criu/include/action-scripts.h | 1 -
 3 files changed, 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index 712aac8..380b05a 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -26,7 +26,6 @@  static const char *action_names[ACT_MAX] = {
 	[ ACT_POST_SETUP_NS ]	= "post-setup-namespaces",
 	[ ACT_POST_RESUME ]	= "post-resume",
 	[ ACT_POST_NET_LOCK ]	= "post-network-lock",
-	[ ACT_POST_SIGRETURN ]	= "post-sigreturn",
 };
 
 struct script {
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 8536ed6..2e84ed3 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1948,10 +1948,6 @@  static int restore_root_task(struct pstree_item *init)
 	if (ret == 0)
 		finalize_restore();
 
-	ret = run_scripts(ACT_POST_SIGRETURN);
-	if (ret)
-		pr_err("Post-sigreturn script ret code %d\n", ret);
-
 	if (restore_freezer_state())
 		pr_err("Unable to restore freezer state\n");
 
diff --git a/criu/include/action-scripts.h b/criu/include/action-scripts.h
index 631350d..e49f57c 100644
--- a/criu/include/action-scripts.h
+++ b/criu/include/action-scripts.h
@@ -12,7 +12,6 @@  enum script_actions {
 	ACT_POST_SETUP_NS,
 	ACT_POST_RESUME,
 	ACT_POST_NET_LOCK,
-	ACT_POST_SIGRETURN,
 
 	ACT_MAX
 };