[CRIU] [PATCH 0/6] Introduce orderliness in pstree_item::ids on restore

Andrei Vagin avagin at virtuozzo.com
Fri May 12 14:27:23 PDT 2017


Applied, thanks!

On Thu, May 11, 2017 at 02:50:04PM +0300, Kirill Tkhai wrote:
> We have many checks for pstree_item::ids over the restore code,
> and all of them are excess, because a task always has ids
> after the commit 848578a7be98 "pstree: Assign ids for dead tasks
> in read_pstree_image()".
> 
> Also, we have many checks for pstree_item::ids::has_xxx_ns_id,
> which are excess for the most of them (pid, net, ipc, uts, mnt),
> because they exist before the criu stabilized its images format
> (commit 2105e18eee70).
> 
> This patchset continues to introduce orderliness in pstee_item::ids,
> and it makes sanity checks of task's ids and the above has_xxx_ns_id
> in the only place. That allows to remove them from the rest of code
> and make it simplier.
> 
> https://travis-ci.org/tkhai/criu/builds/231119481
> 
> ---
> 
> Kirill Tkhai (6):
>       pstree: Delete excess check it read_pstree_image()
>       pstree: Check for always existing task ids on restore
>       pstree: Delete excess check in read_pstree_ids()
>       pstree: Fix alignment in read_pstree_ids()
>       pstree: undef ADD_OR_COPY_ID()
>       pstree: Delete checks of always existing pstree_item::ids on restore
> 
> 
>  criu/cr-restore.c |    2 +-
>  criu/mount.c      |   47 ++++++++++++++++++++++-------------------------
>  criu/net.c        |   22 ++++++++++------------
>  criu/pstree.c     |   35 ++++++++++++++++++-----------------
>  4 files changed, 51 insertions(+), 55 deletions(-)
> 
> --
> Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>


More information about the CRIU mailing list