From 82acfd44878d2b64b251cea8e35552b958db08cc Mon Sep 17 00:00:00 2001 From: Kirill Tkhai Date: Wed, 7 Jun 2017 14:27:38 +0300 Subject: [PATCH] files: Merge shmalloc() to fle_init() Signed-off-by: Kirill Tkhai Signed-off-by: Andrei Vagin --- criu/files.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/criu/files.c b/criu/files.c index b23e1fba4..ba24ce9a7 100644 --- a/criu/files.c +++ b/criu/files.c @@ -692,12 +692,19 @@ int rst_file_params(int fd, FownEntry *fown, int flags) return 0; } -static void fle_init(struct fdinfo_list_entry *fle, int pid, FdinfoEntry *fe) +static struct fdinfo_list_entry *alloc_fle(int pid, FdinfoEntry *fe) { + struct fdinfo_list_entry *fle; + + fle = shmalloc(sizeof(*fle)); + if (!fle) + return NULL; fle->pid = pid; fle->fe = fe; fle->received = 0; fle->stage = FLE_INITIALIZED; + + return fle; } static int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info) @@ -708,12 +715,10 @@ static int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info) pr_info("Collect fdinfo pid=%d fd=%d id=%#x\n", pid, e->fd, e->id); - new_le = shmalloc(sizeof(*new_le)); + new_le = alloc_fle(pid, e); if (!new_le) return -1; - fle_init(new_le, pid, e); - fdesc = find_file_desc(e); if (fdesc == NULL) { pr_err("No file for fd %d id %#x\n", e->fd, e->id);