[CRIU] [RFC v2 2/5] restorer: skip aio restore in check-only mode

[Adrian Reber]

On Thu, Mar 23, 2017 at 04:44:33PM -0700, Andrei Vagin wrote:
> On Thu, Mar 23, 2017 at 07:59:15PM +0000, Adrian Reber wrote:
> > From: Adrian Reber <areber at redhat.com>
> 
> Could you add a description why do we need to skip it?

Unfortunately not. I do not know enough (anything) about AIO to make a
useful comment. If I restore the AIO during --check-only restore the
real restore breaks in AIO. Not sure why. I can add that to the commit
if that helps.

> > 
> > Signed-off-by: Adrian Reber <areber at redhat.com>
> > ---
> >  criu/pie/restorer.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
> > index 53ecaa0..a22f414 100644
> > --- a/criu/pie/restorer.c
> > +++ b/criu/pie/restorer.c
> > @@ -1295,9 +1295,11 @@ long __export_restore_task(struct task_restore_args *args)
> >  	 * up AIO rings.
> >  	 */
> >  
> > -	for (i = 0; i < args->rings_n; i++)
> > -		if (restore_aio_ring(&args->rings[i]) < 0)
> > -			goto core_restore_end;
> > +	if (!args->check_only) {
> > +		for (i = 0; i < args->rings_n; i++)
> > +			if (restore_aio_ring(&args->rings[i]) < 0)
> > +				goto core_restore_end;
> > +	}
> >  
> >  	/*
> >  	 * Finally restore madivse() bits
> > -- 
> > 1.8.3.1

		Adrian