mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

Change crtools to criu in comments

Browse Source 
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Kir Kolyshkin
2013-05-09 10:58:04 -07:00
committed by Pavel Emelyanov
parent c19e62f87c
commit 3e8b82d367
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cr-restore.c
View File

@@ -95,7 +95,7 @@ static int crtools_prepare_shared(struct cr_options *opts)
if (prepare_shared_fdinfo()) if (prepare_shared_fdinfo())
return -1; return -1;
/* Connections are unlocked from crtools */ /* Connections are unlocked from criu */
if (collect_inet_sockets()) if (collect_inet_sockets())
return -1; return -1;
@@ -1591,7 +1591,7 @@ static int prepare_restorer_blob(void)
{ {
/* /*
* We map anonymous mapping, not mremap the restorer itself later. * We map anonymous mapping, not mremap the restorer itself later.
* Otherwise the restorer vma would be tied to crtools binary which * Otherwise the restorer vma would be tied to criu binary which
* in turn will lead to set-exe-file prctl to fail with EBUSY. * in turn will lead to set-exe-file prctl to fail with EBUSY.
*/ */

2
image.c
View File

@@ -360,7 +360,7 @@ static unsigned long page_ids = 1;
void up_page_ids_base(void) void up_page_ids_base(void)
{ {
/* /*
* When page server and crtools dump work on * When page server and criu dump work on
* the same dir, the shmem pagemaps and regular * the same dir, the shmem pagemaps and regular
* pagemaps may have IDs conflicts. Fix this by * pagemaps may have IDs conflicts. Fix this by
* making page server produce page images with * making page server produce page images with

2
pstree.c
View File

@@ -525,7 +525,7 @@ set_mask:
* Workaround for current namespaces model -- * Workaround for current namespaces model --
* all tasks should be in one namespace. And * all tasks should be in one namespace. And
* this namespace is either inherited from the * this namespace is either inherited from the
* crtools or is created for the init task (only) * criu or is created for the init task (only)
*/ */
if (item == root_item) { if (item == root_item) {
pr_info("Will restore in %lx namespaces\n", cflags); pr_info("Will restore in %lx namespaces\n", cflags);

2
sk-tcp.c
View File

@@ -98,7 +98,7 @@ static int tcp_repair_establised(int fd, struct inet_sk_desc *sk)
pr_info("\tTurning repair on for socket %x\n", sk->sd.ino); pr_info("\tTurning repair on for socket %x\n", sk->sd.ino);
/* /*
* Keep the socket open in crtools till the very end. In * Keep the socket open in criu till the very end. In
* case we close this fd after one task fd dumping and * case we close this fd after one task fd dumping and
* fail we'll have to turn repair mode off * fail we'll have to turn repair mode off
*/ */

2
sockets.c
View File

@@ -634,7 +634,7 @@ out:
err = -1; err = -1;
} else if (pid != 0) { } else if (pid != 0) {
/* /*
* If netns isn't dumped, crtools will fail only * If netns isn't dumped, criu will fail only
* if an unsupported socket will be really dumped. * if an unsupported socket will be really dumped.
*/ */
pr_info("Uncollected sockets! Will probably fail later.\n"); pr_info("Uncollected sockets! Will probably fail later.\n");