[CRIU] [PATCH 11/22] parasite: use a propper command for getting ack

Andrew Vagin avagin at gmail.com
Wed May 15 10:19:42 EDT 2013


On Wed, May 15, 2013 at 04:54:48PM +0400, Pavel Emelyanov wrote:
> On 05/08/2013 05:28 PM, Andrey Vagin wrote:
> > 
> > Signed-off-by: Andrey Vagin <avagin at openvz.org>
> > ---
> >  parasite-syscall.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/parasite-syscall.c b/parasite-syscall.c
> > index e366f02..30af8e3 100644
> > --- a/parasite-syscall.c
> > +++ b/parasite-syscall.c
> > @@ -663,7 +663,10 @@ int parasite_get_proc_fd_seized(struct parasite_ctl *ctl)
> >  	fd = recv_fd(ctl->tsock);
> >  	if (fd < 0)
> >  		pr_err("Can't retrieve FD from socket\n");
> > -	__parasite_execute_daemon_wait_ack(PARASITE_CMD_DRAIN_FDS, ctl, ctl->pid.real);
> > +	if (__parasite_execute_daemon_wait_ack(PARASITE_CMD_GET_PROC_FD, ctl, ctl->pid.real)) {
> > +		close(fd);
> > +		return -1;
> > +	}
> >  
> >  	return fd;
> >  }
> > 
> 
> 
> Is this a bugfix for patch #10?

Yes, but these patches have different authors, so they are not merged


More information about the CRIU mailing list