Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-22 17:49:13 +00:00
Code Issues Projects Releases Wiki Activity

files: Kill autofs_create_fle() and use generic helper

Browse source 
On 01.06.2017 14:34, Kirill Tkhai wrote:
> Everything is prepared: the pair "type and id" is
> uniqul, so find_file_desc() in collect_fd() will
> work as expected and it will find the file_desc
> we just added in autofs_create_pipe()->collect_one_pipe_ops().
>
> So, the not-generic helper may be killed.
>
> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>

Returned debug print:

[PATCH 4/5 v2]files: Kill autofs_create_fle() and use generic helper

Everything is prepared: the pair "type and id" is
uniqul, so find_file_desc() in collect_fd() will
work as expected and it will find the file_desc
we just added in autofs_create_pipe()->collect_one_pipe_ops().

So, the not-generic helper may be killed.

v2: Leave debug print on the place.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Acked-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2017-06-01 15:08:36 +03:00 • committed by Pavel Emelyanov
parent 940187818c
commit 107f2e40fe
1 changed files with 3 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
criu/autofs.c
View file

@ -859,28 +859,6 @@ static struct fdinfo_list_entry *autofs_pipe_le(struct pstree_item *master,
return ple;
}
static int autofs_create_fle(struct pstree_item *task, FdinfoEntry *fe,
struct file_desc *desc)
{
struct fdinfo_list_entry *le;
struct rst_info *rst_info = rsti(task);
le = shmalloc(sizeof(*le));
if (!le)
return -1;
fle_init(le, vpid(task), fe);
collect_task_fd(le, rst_info);
list_add_tail(&le->desc_list, &desc->fd_info_head);
le->desc = desc;
pr_info("autofs: added pipe fd %d, flags %#x to %d (with post_open)\n",
le->fe->fd, le->fe->flags, le->pid);
return 0;
}
static int autofs_open_pipefd(struct file_desc *d, int *new_fd)
{
struct fdinfo_list_entry *fle = file_master(d);
@ -933,7 +911,9 @@ static int autofs_create_pipe(struct pstree_item *task, autofs_info_t *i,
if (!fe)
return -1;
return autofs_create_fle(task, fe, &i->pi.d);
pr_info("autofs: adding pipe fd %d, flags %#x to %d (with post_open)\n",
fe->fd, fe->flags, vpid(task));
return collect_fd(vpid(task), fe, rsti(task));
}
static int autofs_add_mount_info(struct pprep_head *ph)