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

files: Rename fdinfo_list_entry's list to desc_list

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-04-18 15:46:04 +04:00
parent 9829dbfdeb
commit 04800b6ed1
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
files.c
View File

@@ -76,7 +76,7 @@ struct fdinfo_list_entry *file_master(struct file_desc *d)
{ {
BUG_ON(list_empty(&d->fd_info_head)); BUG_ON(list_empty(&d->fd_info_head));
return list_first_entry(&d->fd_info_head, return list_first_entry(&d->fd_info_head,
struct fdinfo_list_entry, list); struct fdinfo_list_entry, desc_list);
} }
struct reg_file_info { struct reg_file_info {
@@ -97,7 +97,7 @@ void show_saved_files(void)
struct fdinfo_list_entry *le; struct fdinfo_list_entry *le;
pr_info(" `- type %d ID 0x%x\n", fd->type, fd->id); pr_info(" `- type %d ID 0x%x\n", fd->type, fd->id);
list_for_each_entry(le, &fd->fd_info_head, list) list_for_each_entry(le, &fd->fd_info_head, desc_list)
pr_info(" `- FD %d pid %d\n", le->fd, le->pid); pr_info(" `- FD %d pid %d\n", le->fd, le->pid);
} }
} }
@@ -350,11 +350,11 @@ static int collect_fd(int pid, struct fdinfo_entry *e)
return -1; return -1;
} }
list_for_each_entry(l, &fdesc->fd_info_head, list) list_for_each_entry(l, &fdesc->fd_info_head, desc_list)
if (l->pid > le->pid) if (l->pid > le->pid)
break; break;
list_add_tail(&le->list, &l->list); list_add_tail(&le->desc_list, &l->desc_list);
return 0; return 0;
} }
@@ -483,11 +483,11 @@ static int open_transport_fd(int pid, struct fdinfo_entry *fe, struct file_desc
pr_info("\t%d: Create transport fd for %d\n", pid, fe->fd); pr_info("\t%d: Create transport fd for %d\n", pid, fe->fd);
list_for_each_entry(fle, &d->fd_info_head, list) list_for_each_entry(fle, &d->fd_info_head, desc_list)
if ((fle->pid == pid) && (fle->fd == fe->fd)) if ((fle->pid == pid) && (fle->fd == fe->fd))
break; break;
BUG_ON(&d->fd_info_head == &fle->list); BUG_ON(&d->fd_info_head == &fle->desc_list);
sock = socket(PF_UNIX, SOCK_DGRAM, 0); sock = socket(PF_UNIX, SOCK_DGRAM, 0);
if (sock < 0) { if (sock < 0) {
@@ -551,7 +551,7 @@ static int open_fd(int pid, struct fdinfo_entry *fe,
pr_info("\t%d: Create fd for %d\n", pid, fe->fd); pr_info("\t%d: Create fd for %d\n", pid, fe->fd);
list_for_each_entry(fle, &d->fd_info_head, list) { list_for_each_entry(fle, &d->fd_info_head, desc_list) {
if (pid == fle->pid) { if (pid == fle->pid) {
pr_info("\t\tGoing to dup %d into %d\n", fe->fd, fle->fd); pr_info("\t\tGoing to dup %d into %d\n", fe->fd, fle->fd);
if (fe->fd == fle->fd) if (fe->fd == fle->fd)

2
include/files.h
View File

@@ -28,7 +28,7 @@ enum fdinfo_states {
}; };
struct fdinfo_list_entry { struct fdinfo_list_entry {
struct list_head list; struct list_head desc_list;
int fd; int fd;
int pid; int pid;
int flags; int flags;

2
pipes.c
View File

@@ -86,7 +86,7 @@ static void show_saved_pipe_fds(struct pipe_info *pi)
struct fdinfo_list_entry *fle; struct fdinfo_list_entry *fle;
pr_info(" `- ID %p 0x%xpn", pi, pi->pe.id); pr_info(" `- ID %p 0x%xpn", pi, pi->pe.id);
list_for_each_entry(fle, &pi->d.fd_info_head, list) list_for_each_entry(fle, &pi->d.fd_info_head, desc_list)
pr_info(" `- FD %d pid %d\n", fle->fd, fle->pid); pr_info(" `- FD %d pid %d\n", fle->fd, fle->pid);
} }

2
sockets.c
View File

@@ -1526,7 +1526,7 @@ int resolve_unix_peers(void)
pr_info("\t0x%x -> 0x%x (0x%x) flags 0x%x\n", ui->ue.id, ui->ue.peer, pr_info("\t0x%x -> 0x%x (0x%x) flags 0x%x\n", ui->ue.id, ui->ue.peer,
ui->peer ? ui->peer->ue.id : 0, ui->flags); ui->peer ? ui->peer->ue.id : 0, ui->flags);
list_for_each_entry(fle, &ui->d.fd_info_head, list) list_for_each_entry(fle, &ui->d.fd_info_head, desc_list)
pr_info("\t\tfd %d in pid %d\n", pr_info("\t\tfd %d in pid %d\n",
fle->fd, fle->pid); fle->fd, fle->pid);