Commit c406b063 authored by Pavel Emelyanov's avatar Pavel Emelyanov

pipes: Use file_master instead of list_first_entry

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent f89170ea
...@@ -155,8 +155,7 @@ void mark_pipe_master() ...@@ -155,8 +155,7 @@ void mark_pipe_master()
pr_info(" `- PIPE ID %x\n", pi->pe.pipe_id); pr_info(" `- PIPE ID %x\n", pi->pe.pipe_id);
show_saved_pipe_fds(pi); show_saved_pipe_fds(pi);
fle = list_first_entry(&pi->fd_head, fle = file_master(&pi->fd_head);
struct fdinfo_list_entry, list);
p = pi; p = pi;
fd = fle->fd; fd = fle->fd;
pid = fle->pid; pid = fle->pid;
...@@ -164,8 +163,7 @@ void mark_pipe_master() ...@@ -164,8 +163,7 @@ void mark_pipe_master()
list_for_each_entry(pic, &pi->pipe_list, pipe_list) { list_for_each_entry(pic, &pi->pipe_list, pipe_list) {
list_move(&pic->list, &head); list_move(&pic->list, &head);
fle = list_first_entry(&p->fd_head, fle = file_master(&p->fd_head);
struct fdinfo_list_entry, list);
if (fle->pid < pid || if (fle->pid < pid ||
(pid == fle->pid && fle->fd < fd)) { (pid == fle->pid && fle->fd < fd)) {
p = pic; p = pic;
...@@ -198,7 +196,7 @@ static int recv_pipe_fd(struct pipe_info *pi) ...@@ -198,7 +196,7 @@ static int recv_pipe_fd(struct pipe_info *pi)
char path[PATH_MAX]; char path[PATH_MAX];
int tmp, fd; int tmp, fd;
fle = list_first_entry(&pi->fd_head, struct fdinfo_list_entry, list); fle = file_master(&pi->fd_head);
fd = fle->fd; fd = fle->fd;
pr_info("\tWaiting fd for %d\n", fd); pr_info("\tWaiting fd for %d\n", fd);
...@@ -301,8 +299,7 @@ int open_pipe(struct list_head *l) ...@@ -301,8 +299,7 @@ int open_pipe(struct list_head *l)
struct fdinfo_list_entry *fle; struct fdinfo_list_entry *fle;
BUG_ON(list_empty(&p->fd_head)); BUG_ON(list_empty(&p->fd_head));
fle = list_first_entry(&p->fd_head, fle = file_master(&p->fd_head);
struct fdinfo_list_entry, list);
pr_info("\t\tWait fdinfo pid=%d fd=%d\n", fle->pid, fle->fd); pr_info("\t\tWait fdinfo pid=%d fd=%d\n", fle->pid, fle->fd);
futex_wait_while(&fle->real_pid, 0); futex_wait_while(&fle->real_pid, 0);
......
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