Skip to content

C
criu
Commit 87da9b83 authored by Pavel Emelyanov's avatar Pavel Emelyanov
Browse files
Options

posix-timers: Clean restore code flow 

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent d48d6c72
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
cr-restore.c
View file @ 87da9b83
...@@ -1867,21 +1867,22 @@ static int prepare_posix_timers(int pid, CoreEntry *core) ...@@ -1867,21 +1867,22 @@ static int prepare_posix_timers(int pid, CoreEntry *core)
PosixTimerEntry *pte; PosixTimerEntry *pte;
ret = pb_read_one_eof(fd, &pte, PB_POSIX_TIMER); ret = pb_read_one_eof(fd, &pte, PB_POSIX_TIMER);
if (ret <= 0) { if (ret <= 0)
goto out; break;
}
t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE); t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE);
if (!t) if (!t)
goto out; break;
ret = decode_posix_timer(pte, t); ret = decode_posix_timer(pte, t);
if (ret < 0) if (ret < 0)
goto out; break;
posix_timer_entry__free_unpacked(pte, NULL); posix_timer_entry__free_unpacked(pte, NULL);
posix_timers_nr++; posix_timers_nr++;
} }
close_safe(&fd);
out: out:
if (posix_timers_nr > 0) if (posix_timers_nr > 0)
qsort(rst_mem_remap_ptr(posix_timers_cpos, RM_PRIVATE), qsort(rst_mem_remap_ptr(posix_timers_cpos, RM_PRIVATE),
...@@ -1889,7 +1890,6 @@ out: ...@@ -1889,7 +1890,6 @@ out:
sizeof(struct restore_posix_timer), sizeof(struct restore_posix_timer),
cmp_posix_timer_proc_id); cmp_posix_timer_proc_id);
close_safe(&fd);
return ret; return ret;
} }
......
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