[CRIU] [PATCH v3 10/16] cr-restore: prepare shared information before namespaces

Pavel Emelyanov xemul at parallels.com
Mon Dec 14 03:48:21 PST 2015


On 12/14/2015 02:19 PM, Stanislav Kinsburskiy wrote:
> 
> 
> 14.12.2015 12:17, Pavel Emelyanov пишет:
>> On 12/10/2015 06:17 PM, Stanislav Kinsburskiy wrote:
>>> Autofs mount restore will can create additional file descriptors. They have to
>>> be shared between process.
>>> Thus shared information have to be prepaired before mounts restore.
>>>
>>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
>>> ---
>>>   cr-restore.c |    4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/cr-restore.c b/cr-restore.c
>>> index 8f3d28f..1452735 100644
>>> --- a/cr-restore.c
>>> +++ b/cr-restore.c
>>> @@ -1538,10 +1538,10 @@ static int restore_task_with_children(void *_arg)
>>>   		if (mount_proc())
>>>   			goto err;
>>>   
>>> -		if (prepare_namespace(current, ca->clone_flags))
>>> +		if (root_prepare_shared())
>> Hm... Did test pass with this change? The root_prepare_shared() call prepare_remaps()
>> which require the mount namespaces' prepared.
> 
> Which test? A container with AutoFS was restored successfully.
> But I haven't run all the zdtm tests though.

Please, do.



More information about the CRIU mailing list