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

restore: shmid_id structure from find_shmem_id() function

Browse Source 
Returning shmid value of not enough, because SYSV IPC shmid equal to zero is a
valid value.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@openvz.org>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Kinsbursky Stanislav
2012-02-14 20:19:56 +03:00
committed by Cyrill Gorcunov
parent b3cfe73556
commit a5c6c02f49
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cr-restore.c
View File

@@ -440,15 +440,15 @@ static int prepare_shared(int ps_fd)
return ret; return ret;
} }
static unsigned long find_shmem_id(unsigned long addr) static struct shmem_id *find_shmem_id(unsigned long addr)
{ {
struct shmem_id *si; struct shmem_id *si;
for (si = shmem_ids; si; si = si->next) for (si = shmem_ids; si; si = si->next)
if (si->addr <= addr && si->end >= addr) if (si->addr <= addr && si->end >= addr)
return si->shmid; return si;
return 0; return NULL;
} }
static int save_shmem_id(struct shmem_entry *e) static int save_shmem_id(struct shmem_entry *e)
@@ -529,13 +529,13 @@ find_shmem_page(struct shmems *shms, unsigned long addr, unsigned long shmid)
static int try_fixup_shared_map(int pid, struct vma_entry *vi, int fd) static int try_fixup_shared_map(int pid, struct vma_entry *vi, int fd)
{ {
struct shmem_info *si; struct shmem_info *si;
unsigned long shmid; struct shmem_id *shmid;
shmid = find_shmem_id(vi->start); shmid = find_shmem_id(vi->start);
if (!shmid) if (!shmid)
return 0; return 0;
si = find_shmem(shmems, vi->start, shmid); si = find_shmem(shmems, vi->start, shmid->shmid);
pr_info("%d: Search for %016lx shmem %p/%d\n", pid, vi->start, si, si ? si->pid : -1); pr_info("%d: Search for %016lx shmem %p/%d\n", pid, vi->start, si, si ? si->pid : -1);
if (!si) { if (!si) {
@@ -610,7 +610,7 @@ static int fixup_vma_fds(int pid, int fd)
static inline bool should_restore_page(int pid, unsigned long va) static inline bool should_restore_page(int pid, unsigned long va)
{ {
struct shmem_info *si; struct shmem_info *si;
unsigned long shmid; struct shmem_id *shmid;
/* /*
* If this is not a shmem virtual address * If this is not a shmem virtual address
@@ -620,7 +620,7 @@ static inline bool should_restore_page(int pid, unsigned long va)
if (!shmid) if (!shmid)
return true; return true;
si = find_shmem_page(shmems, va, shmid); si = find_shmem_page(shmems, va, shmid->shmid);
return si->pid == pid; return si->pid == pid;
} }