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

restore: File mappings should use process pid as well

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2011-09-28 13:19:30 +04:00
parent 2de8de5d4e
commit 3971dbb78d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cr-restore.c
View File

@ -32,6 +32,7 @@
struct fmap_fd {
struct fmap_fd *next;
unsigned long start;
int pid;
int fd;
};
@ -362,14 +363,14 @@ static int prepare_shared(int ps_fd)
return 0;
}
static struct fmap_fd *pop_fmap_fd(unsigned long start)
static struct fmap_fd *pop_fmap_fd(int pid, unsigned long start)
{
struct fmap_fd **p, *r;
pr_info("Looking for %lx : ", start);
pr_info("%d: Looking for %lx : ", pid, start);
for (p = &fmap_fds; *p != NULL; p = &(*p)->next) {
if ((*p)->start != start)
if ((*p)->start != start || (*p)->pid != pid)
continue;
r = *p;
@ -446,6 +447,8 @@ static int open_fmap(int pid, struct fdinfo_entry *fe, int fd)
new->start = fe->addr;
new->fd = tmp;
new->next = fmap_fds;
new->pid = pid;
fmap_fds = new;
return 0;
@ -584,7 +587,7 @@ static int try_fixup_file_map(int pid, struct vma_entry *vi, int fd)
{
struct fmap_fd *fmfd;
fmfd = pop_fmap_fd(vi->start);
fmfd = pop_fmap_fd(pid, vi->start);
if (fmfd != NULL) {
pr_info("%d: Fixing %lx vma to %d fd\n", pid, vi->start, fmfd->fd);
lseek(fd, -sizeof(*vi), SEEK_CUR);