mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

restore: Drop a few style rudiments from code

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov
2011-09-27 01:14:38 +04:00
parent 961fcdc697
commit 06ae1f8697
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

@@ -488,17 +488,15 @@ static int prepare_fds(int pid)
} }
pr_info("\t%d: Got fd for %lx type %d namelen %d\n", pid, pr_info("\t%d: Got fd for %lx type %d namelen %d\n", pid,
(unsigned long)fe.addr, fe.type, fe.len); (unsigned long)fe.addr, fe.type, fe.len);
switch (fe.type) { switch (fe.type) {
case FDINFO_FD: case FDINFO_FD:
if (open_fd(pid, &fe, &fdinfo_fd)) if (open_fd(pid, &fe, &fdinfo_fd))
return 1; return 1;
break; break;
case FDINFO_MAP: case FDINFO_MAP:
if (open_fmap(pid, &fe, fdinfo_fd)) if (open_fmap(pid, &fe, fdinfo_fd))
return 1; return 1;
break; break;
default: default:
fprintf(stderr, "Some bullshit in a file\n"); fprintf(stderr, "Some bullshit in a file\n");
@@ -618,7 +616,8 @@ static int try_fixup_shared_map(int pid, struct vma_entry *vi, int fd)
int sh_fd; int sh_fd;
sh_fd = shmem_wait_and_open(si); sh_fd = shmem_wait_and_open(si);
pr_info("%d: Fixing %lx vma to %lx/%d shmem -> %d\n", pid, vi->start, si->id, si->pid, sh_fd); pr_info("%d: Fixing %lx vma to %lx/%d shmem -> %d\n",
pid, vi->start, si->id, si->pid, sh_fd);
if (fd < 0) { if (fd < 0) {
perror("Can't open shmem"); perror("Can't open shmem");
return 1; return 1;
@@ -656,10 +655,12 @@ 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_PRIVATE) || if ((vi.status & VMA_FILE_PRIVATE) ||
(vi.status & VMA_FILE_SHARED) ||
(vi.status & VMA_ANON_SHARED)) { (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;
@@ -755,7 +756,6 @@ static int prepare_image_maps(int fd, int pid)
if (fixup_pages_data(pid, fd)) if (fixup_pages_data(pid, fd))
return 1; return 1;
//close(fd);
return 0; return 0;
} }