Commit 6bf2a433 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Pavel Emelyanov

files: Add fle_init() for initialization new fdinfo_list_entry

No functional changes

v3: Also do real_pid futex initialization

travis-ci: success for Rework file opening scheme to make it asynchronous (rev5)
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent fa6eb98a
...@@ -873,9 +873,7 @@ static int autofs_create_fle(struct pstree_item *task, FdinfoEntry *fe, ...@@ -873,9 +873,7 @@ static int autofs_create_fle(struct pstree_item *task, FdinfoEntry *fe,
return -1; return -1;
le = (void *)ALIGN((long)le, sizeof(int)); le = (void *)ALIGN((long)le, sizeof(int));
futex_init(&le->real_pid); fle_init(le, task->pid->ns[0].virt, fe);
le->pid = task->pid->ns[0].virt;
le->fe = fe;
collect_gen_fd(le, rst_info); collect_gen_fd(le, rst_info);
......
...@@ -694,9 +694,7 @@ static int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info) ...@@ -694,9 +694,7 @@ static int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info)
if (!new_le) if (!new_le)
return -1; return -1;
futex_init(&new_le->real_pid); fle_init(new_le, pid, e);
new_le->pid = pid;
new_le->fe = e;
fdesc = find_file_desc(e); fdesc = find_file_desc(e);
if (fdesc == NULL) { if (fdesc == NULL) {
......
...@@ -74,6 +74,13 @@ struct fdinfo_list_entry { ...@@ -74,6 +74,13 @@ struct fdinfo_list_entry {
FdinfoEntry *fe; FdinfoEntry *fe;
}; };
static inline void fle_init(struct fdinfo_list_entry *fle, int pid, FdinfoEntry *fe)
{
futex_init(&fle->real_pid);
fle->pid = pid;
fle->fe = fe;
}
/* reports whether fd_a takes prio over fd_b */ /* reports whether fd_a takes prio over fd_b */
static inline int fdinfo_rst_prio(struct fdinfo_list_entry *fd_a, struct fdinfo_list_entry *fd_b) static inline int fdinfo_rst_prio(struct fdinfo_list_entry *fd_a, struct fdinfo_list_entry *fd_b)
{ {
......
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