mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

files: Use open_reg_by_id helper where appropriate

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-04-09 15:57:05 +04:00
parent 447f369ba9
commit f560ddea55
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
files.c
View File

@@ -501,7 +501,6 @@ int prepare_fs(int pid)
{ {
int ifd, cwd; int ifd, cwd;
struct fs_entry fe; struct fs_entry fe;
struct file_desc *fd;
ifd = open_image_ro(CR_FD_FS, pid); ifd = open_image_ro(CR_FD_FS, pid);
if (ifd < 0) if (ifd < 0)
@@ -510,14 +509,7 @@ int prepare_fs(int pid)
if (read_img(ifd, &fe) < 0) if (read_img(ifd, &fe) < 0)
return -1; return -1;
fd = find_file_desc_raw(FDINFO_REG, fe.cwd_id); cwd = open_reg_by_id(fe.cwd_id);
if (fd == NULL) {
pr_err("Can't find file for %d's cwd (%x)\n",
pid, fe.cwd_id);
return -1;
}
cwd = open_fe_fd(fd);
if (cwd < 0) if (cwd < 0)
return -1; return -1;
@@ -543,14 +535,5 @@ int prepare_fs(int pid)
int get_filemap_fd(int pid, struct vma_entry *vma_entry) int get_filemap_fd(int pid, struct vma_entry *vma_entry)
{ {
struct file_desc *fd; return open_reg_by_id(vma_entry->shmid);
fd = find_file_desc_raw(FDINFO_REG, vma_entry->shmid);
if (fd == NULL) {
pr_err("Can't find file for mapping %lx-%lx\n",
vma_entry->start, vma_entry->end);
return -1;
}
return open_fe_fd(fd);
} }