Commit 50131370 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Pavel Emelyanov

files: Extract new_fle assignment from collect_fd() to separate func

The algorhythm of searching file master will be more complicated
in next patches. So, move current functionality in separate func.
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent deba6311
...@@ -708,9 +708,21 @@ static struct fdinfo_list_entry *alloc_fle(int pid, FdinfoEntry *fe) ...@@ -708,9 +708,21 @@ static struct fdinfo_list_entry *alloc_fle(int pid, FdinfoEntry *fe)
return fle; return fle;
} }
static void collect_desc_fle(struct fdinfo_list_entry *new_le, struct file_desc *fdesc)
{
struct fdinfo_list_entry *le;
new_le->desc = fdesc;
list_for_each_entry(le, &fdesc->fd_info_head, desc_list)
if (pid_rst_prio(new_le->pid, le->pid))
break;
list_add_tail(&new_le->desc_list, &le->desc_list);
}
int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info, bool fake) int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info, bool fake)
{ {
struct fdinfo_list_entry *le, *new_le; struct fdinfo_list_entry *new_le;
struct file_desc *fdesc; struct file_desc *fdesc;
pr_info("Collect fdinfo pid=%d fd=%d id=%#x\n", pr_info("Collect fdinfo pid=%d fd=%d id=%#x\n",
...@@ -726,16 +738,9 @@ int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info, bool fake) ...@@ -726,16 +738,9 @@ int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info, bool fake)
pr_err("No file for fd %d id %#x\n", e->fd, e->id); pr_err("No file for fd %d id %#x\n", e->fd, e->id);
return -1; return -1;
} }
new_le->desc = fdesc; collect_desc_fle(new_le, fdesc);
list_for_each_entry(le, &fdesc->fd_info_head, desc_list)
if (pid_rst_prio(new_le->pid, le->pid))
break;
collect_task_fd(new_le, rst_info); collect_task_fd(new_le, rst_info);
list_add_tail(&new_le->desc_list, &le->desc_list);
return 0; return 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