Skip to content

C
criu
Commit 961fcdc6 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov
Browse files
Options

restore: Cleanup fixup_vma_fds a bit 

Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
parent 30f002d2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
cr-restore.c
View file @ 961fcdc6
...@@ -637,7 +637,7 @@ static int try_fixup_shared_map(int pid, struct vma_entry *vi, int fd) ...@@ -637,7 +637,7 @@ static int try_fixup_shared_map(int pid, struct vma_entry *vi, int fd)
static int fixup_vma_fds(int pid, int fd) static int fixup_vma_fds(int pid, int fd)
{ {
int offset = sizeof(struct core_entry) + sizeof(u32); int offset = GET_FILE_OFF_AFTER(struct core_entry);
pr_info("Seek for: %d bytes\n", offset); pr_info("Seek for: %d bytes\n", offset);
lseek(fd, offset, SEEK_SET); lseek(fd, offset, SEEK_SET);
...@@ -656,15 +656,13 @@ static int fixup_vma_fds(int pid, int fd) ...@@ -656,15 +656,13 @@ static int fixup_vma_fds(int pid, int fd)
if (!(vi.status & VMA_AREA_REGULAR)) if (!(vi.status & VMA_AREA_REGULAR))
continue; continue;
if ((vi.status & VMA_FILE_SHARED) || if ((vi.status & VMA_FILE_PRIVATE) ||
(vi.status & VMA_FILE_PRIVATE)) { (vi.status & VMA_ANON_SHARED)) {
pr_info("%d: Fixing %016lx-%016lx %016lx vma\n", pid, vi.start, vi.end, vi.pgoff); pr_info("%d: Fixing %016lx-%016lx %016lx vma\n", pid, vi.start, vi.end, vi.pgoff);
if (try_fixup_file_map(pid, &vi, fd)) if (try_fixup_file_map(pid, &vi, fd))
return 1; return 1;
}
if (vi.status & VMA_ANON_SHARED) {
if (try_fixup_shared_map(pid, &vi, fd)) if (try_fixup_shared_map(pid, &vi, fd))
return 1; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment