[v4,04/17] cr-restore: declare SPFS_MNGR_SK service fd

Submitted by Stanislav Kinsburskiy on May 20, 2016, 11:37 a.m.

Details

Message ID 20160520113707.360872.78733.stgit@skinsbursky-vz7-gold.qa.sw.ru
State Rejected
Series "NFS migration support"
Headers show

Commit Message

Stanislav Kinsburskiy May 20, 2016, 11:37 a.m.
This socket will be used to access spfs manager on restore

Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
---
 criu/cr-restore.c        |    1 +
 criu/include/servicefd.h |    1 +
 2 files changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 0f6cdde..1f77999 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3487,6 +3487,7 @@  static int sigreturn_restore(pid_t pid, CoreEntry *core)
 	close_proc();
 	close_service_fd(ROOT_FD_OFF);
 	close_service_fd(USERNSD_SK);
+	close_service_fd(SPFS_MNGR_SK);
 
 	__gcov_flush();
 
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index a9e35a2..37618fa 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -19,6 +19,7 @@  enum sfd_type {
 	CGROUP_YARD,
 	USERNSD_SK,	/* Socket for usernsd */
 	NS_FD_OFF,	/* Node's net namespace fd */
+	SPFS_MNGR_SK,   /* Spfs manager socket */
 
 	SERVICE_FD_MAX
 };

Comments

Pavel Emelianov June 2, 2016, 11:10 a.m.
On 05/20/2016 02:37 PM, Stanislav Kinsburskiy wrote:
> This socket will be used to access spfs manager on restore
> 
> Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
> ---
>  criu/cr-restore.c        |    1 +
>  criu/include/servicefd.h |    1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/criu/cr-restore.c b/criu/cr-restore.c
> index 0f6cdde..1f77999 100644
> --- a/criu/cr-restore.c
> +++ b/criu/cr-restore.c
> @@ -3487,6 +3487,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
>  	close_proc();
>  	close_service_fd(ROOT_FD_OFF);
>  	close_service_fd(USERNSD_SK);
> +	close_service_fd(SPFS_MNGR_SK);
>  
>  	__gcov_flush();
>  
> diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
> index a9e35a2..37618fa 100644
> --- a/criu/include/servicefd.h
> +++ b/criu/include/servicefd.h
> @@ -19,6 +19,7 @@ enum sfd_type {
>  	CGROUP_YARD,
>  	USERNSD_SK,	/* Socket for usernsd */
>  	NS_FD_OFF,	/* Node's net namespace fd */
> +	SPFS_MNGR_SK,   /* Spfs manager socket */

Spfs acronym should be explained.

>  	SERVICE_FD_MAX
>  };
> 
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu
> .
>
Stanislav Kinsburskiy June 2, 2016, 12:03 p.m.
02.06.2016 13:10, Pavel Emelyanov пишет:
> On 05/20/2016 02:37 PM, Stanislav Kinsburskiy wrote:
>> This socket will be used to access spfs manager on restore
>>
>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
>> ---
>>   criu/cr-restore.c        |    1 +
>>   criu/include/servicefd.h |    1 +
>>   2 files changed, 2 insertions(+)
>>
>> diff --git a/criu/cr-restore.c b/criu/cr-restore.c
>> index 0f6cdde..1f77999 100644
>> --- a/criu/cr-restore.c
>> +++ b/criu/cr-restore.c
>> @@ -3487,6 +3487,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
>>   	close_proc();
>>   	close_service_fd(ROOT_FD_OFF);
>>   	close_service_fd(USERNSD_SK);
>> +	close_service_fd(SPFS_MNGR_SK);
>>   
>>   	__gcov_flush();
>>   
>> diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
>> index a9e35a2..37618fa 100644
>> --- a/criu/include/servicefd.h
>> +++ b/criu/include/servicefd.h
>> @@ -19,6 +19,7 @@ enum sfd_type {
>>   	CGROUP_YARD,
>>   	USERNSD_SK,	/* Socket for usernsd */
>>   	NS_FD_OFF,	/* Node's net namespace fd */
>> +	SPFS_MNGR_SK,   /* Spfs manager socket */
> Spfs acronym should be explained.

Where? In the comment?

>>   	SERVICE_FD_MAX
>>   };
>>
>> _______________________________________________
>> CRIU mailing list
>> CRIU@openvz.org
>> https://lists.openvz.org/mailman/listinfo/criu
>> .
>>
Pavel Emelianov June 6, 2016, noon
On 06/02/2016 03:03 PM, Stanislav Kinsburskiy wrote:
> 
> 
> 02.06.2016 13:10, Pavel Emelyanov пишет:
>> On 05/20/2016 02:37 PM, Stanislav Kinsburskiy wrote:
>>> This socket will be used to access spfs manager on restore
>>>
>>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
>>> ---
>>>   criu/cr-restore.c        |    1 +
>>>   criu/include/servicefd.h |    1 +
>>>   2 files changed, 2 insertions(+)
>>>
>>> diff --git a/criu/cr-restore.c b/criu/cr-restore.c
>>> index 0f6cdde..1f77999 100644
>>> --- a/criu/cr-restore.c
>>> +++ b/criu/cr-restore.c
>>> @@ -3487,6 +3487,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
>>>   	close_proc();
>>>   	close_service_fd(ROOT_FD_OFF);
>>>   	close_service_fd(USERNSD_SK);
>>> +	close_service_fd(SPFS_MNGR_SK);
>>>   
>>>   	__gcov_flush();
>>>   
>>> diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
>>> index a9e35a2..37618fa 100644
>>> --- a/criu/include/servicefd.h
>>> +++ b/criu/include/servicefd.h
>>> @@ -19,6 +19,7 @@ enum sfd_type {
>>>   	CGROUP_YARD,
>>>   	USERNSD_SK,	/* Socket for usernsd */
>>>   	NS_FD_OFF,	/* Node's net namespace fd */
>>> +	SPFS_MNGR_SK,   /* Spfs manager socket */
>> Spfs acronym should be explained.
> 
> Where? In the comment?

In code comment, yes.