[Devel] [PATCH 5/6] vzctl: transfer fs in vps_chkpnt, vps_restore, env_start_FN

Andrey Vagin avagin at openvz.org
Thu May 16 05:14:51 PDT 2013


Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 include/env.h      | 4 ++--
 src/lib/hooks_vz.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/env.h b/include/env.h
index 1628bbf..dd5c2f8 100644
--- a/include/env.h
+++ b/include/env.h
@@ -34,8 +34,8 @@
 
 
 
-typedef int (*env_create_FN)(vps_handler *h, envid_t veid, int wait_p,
-				int old_wait_p, int err_p, void *data);
+typedef int (*env_create_FN)(vps_handler *h, envid_t veid, const fs_param *fs,
+			int wait_p, int old_wait_p, int err_p, void *data);
 
 /** Stop modes.
  */
diff --git a/src/lib/hooks_vz.c b/src/lib/hooks_vz.c
index a30722b..087df58 100644
--- a/src/lib/hooks_vz.c
+++ b/src/lib/hooks_vz.c
@@ -261,7 +261,7 @@ static int vz_do_env_create(struct arg_start *arg)
 		if (fn == NULL) {
 			ret = _env_create(h, (void *)arg);
 		} else {
-			ret = fn(h, veid, wait_p, old_wait_p, err_p, data);
+			ret = fn(h, veid, &res->fs, wait_p, old_wait_p, err_p, data);
 		}
 env_err:
 		if (ret)
@@ -700,8 +700,8 @@ err:
 	return ret;
 }
 
-static int restore_fn(vps_handler *h, envid_t veid, int wait_p,
-		int old_wait_p, int err_p, void *data)
+static int restore_fn(vps_handler *h, envid_t veid, const fs_param *fs,
+			int wait_p, int old_wait_p, int err_p, void *data)
 {
 	int status, len, len1, ret;
 	cpt_param *param = (cpt_param *) data;
-- 
1.8.2




More information about the Devel mailing list