[CRIU] [PATCH 4/7] remove unused field nr_zombes from rst_info

[Pavel Emelyanov]

Nice catch :) Applied!

On 06/23/2016 06:13 PM, Tycho Andersen wrote:
> Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
> ---
>  criu/cr-restore.c       | 4 +---
>  criu/include/rst_info.h | 2 --
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/criu/cr-restore.c b/criu/cr-restore.c
> index e0b19fe..f3e2cfb 100644
> --- a/criu/cr-restore.c
> +++ b/criu/cr-restore.c
> @@ -834,9 +834,7 @@ static inline int fork_with_pid(struct pstree_item *item)
>  
>  		rsti(item)->has_seccomp = ca.core->tc->seccomp_mode != SECCOMP_MODE_DISABLED;
>  
> -		if (item->pid.state == TASK_DEAD)
> -			rsti(item->parent)->nr_zombies++;
> -		else if (!task_alive(item)) {
> +		if (item->pid.state != TASK_DEAD && !task_alive(item)) {
>  			pr_err("Unknown task state %d\n", item->pid.state);
>  			return -1;
>  		}
> diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
> index 562e2f0..bf6a64f 100644
> --- a/criu/include/rst_info.h
> +++ b/criu/include/rst_info.h
> @@ -39,8 +39,6 @@ struct rst_info {
>  
>  	void			*munmap_restorer;
>  
> -	int			nr_zombies;
> -
>  	int service_fd_id;
>  	struct fdt		*fdt;
>  
>