mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 05:48:05 +00:00
Code Issues Releases Wiki Activity

mm: s/PAGES_SHMEM/SHMEM_PAGES

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin 2012-03-21 10:12:00 +04:00 committed by Pavel Emelyanov
parent 5dda50468b
commit 31feef8ab4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cr-restore.c
View File

@ -648,7 +648,7 @@ static int fixup_pages_data(int pid, int fd)
} }
close_safe(&pgfd); close_safe(&pgfd);
pgfd = open_image_ro(CR_FD_PAGES_SHMEM, pid); pgfd = open_image_ro(CR_FD_SHMEM_PAGES, pid);
if (pgfd < 0) if (pgfd < 0)
return -1; return -1;

4
crtools.c
View File

@ -46,8 +46,8 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
}, },
/* shared memory pages data */ /* shared memory pages data */
[CR_FD_PAGES_SHMEM] = { [CR_FD_SHMEM_PAGES] = {
.fmt = FMT_FNAME_PAGES_SHMEM, .fmt = FMT_FNAME_SHMEM_PAGES,
.magic = PAGES_MAGIC, .magic = PAGES_MAGIC,
}, },

6
include/crtools.h
View File

@ -21,7 +21,7 @@ enum {
CR_FD_FDINFO, CR_FD_FDINFO,
CR_FD_PAGES, CR_FD_PAGES,
CR_FD_PAGES_SHMEM, CR_FD_SHMEM_PAGES,
CR_FD_CORE, CR_FD_CORE,
CR_FD_PIPES, CR_FD_PIPES,
CR_FD_SHMEM, CR_FD_SHMEM,
@ -75,7 +75,7 @@ extern struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX];
#define FMT_FNAME_FDINFO "fdinfo-%d.img" #define FMT_FNAME_FDINFO "fdinfo-%d.img"
#define FMT_FNAME_PAGES "pages-%d.img" #define FMT_FNAME_PAGES "pages-%d.img"
#define FMT_FNAME_PAGES_SHMEM "pages-shmem-%d.img" #define FMT_FNAME_SHMEM_PAGES "pages-shmem-%d.img"
#define FMT_FNAME_CORE "core-%d.img" #define FMT_FNAME_CORE "core-%d.img"
#define FMT_FNAME_CORE_OUT "core-%d.img.out" #define FMT_FNAME_CORE_OUT "core-%d.img.out"
#define FMT_FNAME_PIPES "pipes-%d.img" #define FMT_FNAME_PIPES "pipes-%d.img"
@ -119,7 +119,7 @@ struct cr_fdset {
#define CR_FD_DESC_TASK (\ #define CR_FD_DESC_TASK (\
CR_FD_DESC_USE(CR_FD_FDINFO) |\ CR_FD_DESC_USE(CR_FD_FDINFO) |\
CR_FD_DESC_USE(CR_FD_PAGES) |\ CR_FD_DESC_USE(CR_FD_PAGES) |\
CR_FD_DESC_USE(CR_FD_PAGES_SHMEM) |\ CR_FD_DESC_USE(CR_FD_SHMEM_PAGES) |\
CR_FD_DESC_USE(CR_FD_CORE) |\ CR_FD_DESC_USE(CR_FD_CORE) |\
CR_FD_DESC_USE(CR_FD_PIPES) |\ CR_FD_DESC_USE(CR_FD_PIPES) |\
CR_FD_DESC_USE(CR_FD_SHMEM) |\ CR_FD_DESC_USE(CR_FD_SHMEM) |\

6
parasite-syscall.c
View File

@ -538,7 +538,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = parasite_prep_file(CR_FD_PAGES_SHMEM, ctl, cr_fdset); ret = parasite_prep_file(CR_FD_SHMEM_PAGES, ctl, cr_fdset);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -598,7 +598,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
if (write_img(cr_fdset->fds[CR_FD_PAGES], &zero_page_entry)) if (write_img(cr_fdset->fds[CR_FD_PAGES], &zero_page_entry))
goto out; goto out;
if (write_img(cr_fdset->fds[CR_FD_PAGES_SHMEM], &zero_page_entry)) if (write_img(cr_fdset->fds[CR_FD_SHMEM_PAGES], &zero_page_entry))
goto out; goto out;
pr_info("\n"); pr_info("\n");
@ -607,7 +607,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
out: out:
fchmod(cr_fdset->fds[CR_FD_PAGES], CR_FD_PERM); fchmod(cr_fdset->fds[CR_FD_PAGES], CR_FD_PERM);
fchmod(cr_fdset->fds[CR_FD_PAGES_SHMEM], CR_FD_PERM); fchmod(cr_fdset->fds[CR_FD_SHMEM_PAGES], CR_FD_PERM);
pr_info("----------------------------------------\n"); pr_info("----------------------------------------\n");
return ret; return ret;