[CRIU] [PATCH] cr-restore: move add_ns_shared_cb declaration to include/namespaces.h

Pavel Emelyanov xemul at virtuozzo.com
Sun Mar 20 23:51:59 PDT 2016


On 03/17/2016 05:33 PM, Stanislav Kinsburskiy wrote:
> How about this one (applied on top of criu-dev):

With tabs screwed up into spaces? Nice enough, I've fixed it and applied :)

> commit 3b4f05d5c00eae44e08cc3c651cfd1bf89f5e2bc
> Author: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
> Date:   Thu Mar 17 17:10:34 2016 +0300
> 
>      cr-restore: move add_ns_shared_cb declaration to include/namespaces.h
> 
>      Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
> 
> diff --git a/criu/autofs.c b/criu/autofs.c
> index 25fc8f1..1c7c126 100644
> --- a/criu/autofs.c
> +++ b/criu/autofs.c
> @@ -22,8 +22,6 @@
> 
>   #define AUTOFS_CATATONIC_FD    -1
> 
> -extern int add_post_prepare_cb(int (*actor)(void *data), void *data);
> -
>   struct autofs_pipe_s {
>          struct list_head list;
>          unsigned long inode;
> diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
> index 303c9e6..4c77964 100644
> --- a/criu/include/namespaces.h
> +++ b/criu/include/namespaces.h
> @@ -134,4 +134,6 @@ extern int __userns_call(const char *func_name, 
> uns_call_t call, int flags,
>          __userns_call(__stringify(__call), __call, __flags,     \
>                        __arg, __arg_size, __fd)
> 
> +extern int add_ns_shared_cb(int (*actor)(void *data), void *data);
> +
>   #endif /* __CR_NS_H__ */
> 
> 
> 17.03.2016 15:27, Pavel Emelyanov пишет:
>> On 03/17/2016 05:12 PM, Stanislav Kinsburskiy wrote:
>>> Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
>>> ---
>>>   criu/autofs.c             |    2 --
>>>   criu/include/namespaces.h |    2 ++
>>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/criu/autofs.c b/criu/autofs.c
>>> index 3be6ab4..d6c2b80 100644
>>> --- a/criu/autofs.c
>>> +++ b/criu/autofs.c
>>> @@ -22,8 +22,6 @@
>>>   
>>>   #define AUTOFS_CATATONIC_FD	-1
>>>   
>>> -extern int add_ns_shared_cb(int (*actor)(void *data), void *data);
>> Doesn't apply :)
>>
>>> -
>>>   struct autofs_pipe_s {
>>>   	struct list_head list;
>>>   	unsigned long inode;
>>> diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
>>> index 303c9e6..4c77964 100644
>>> --- a/criu/include/namespaces.h
>>> +++ b/criu/include/namespaces.h
>>> @@ -134,4 +134,6 @@ extern int __userns_call(const char *func_name, uns_call_t call, int flags,
>>>   	__userns_call(__stringify(__call), __call, __flags,	\
>>>   		      __arg, __arg_size, __fd)
>>>   
>>> +extern int add_ns_shared_cb(int (*actor)(void *data), void *data);
>>> +
>>>   #endif /* __CR_NS_H__ */
>>>
>>> _______________________________________________
>>> CRIU mailing list
>>> CRIU at openvz.org
>>> https://lists.openvz.org/mailman/listinfo/criu
>>> .
>>>
> 
> .
> 



More information about the CRIU mailing list