kerndat: call kerndat_link_nsid()

Submitted by Andrei Vagin on Jan. 11, 2018, 6:16 p.m.

Details

Message ID 20180111181655.29652-1-avagin@openvz.org
State Accepted
Series "kerndat: call kerndat_link_nsid()"
Commit a740b4e438cdc6cd3aa340c16305dad8b613d501
Headers show

Commit Message

Andrei Vagin Jan. 11, 2018, 6:16 p.m.
From: Andrei Vagin <avagin@virtuozzo.com>

It was droped during one of rebases.

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 criu/kerndat.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/kerndat.c b/criu/kerndat.c
index b71df1c7c..9a4300e27 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1036,6 +1036,8 @@  int kerndat_init(void)
 	if (!ret)
 		ret = kerndat_nsid();
 	if (!ret)
+		ret = kerndat_link_nsid();
+	if (!ret)
 		ret = kerndat_has_memfd_create();
 	if (!ret)
 		ret = kerndat_detect_stack_guard_gap();

Comments

Andrei Vagin Jan. 25, 2018, 12:36 a.m.
Applied, thanks
On Thu, Jan 11, 2018 at 09:16:55PM +0300, Andrei Vagin wrote:
> From: Andrei Vagin <avagin@virtuozzo.com>
> 
> It was droped during one of rebases.
> 
> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
> ---
>  criu/kerndat.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/criu/kerndat.c b/criu/kerndat.c
> index b71df1c7c..9a4300e27 100644
> --- a/criu/kerndat.c
> +++ b/criu/kerndat.c
> @@ -1036,6 +1036,8 @@ int kerndat_init(void)
>  	if (!ret)
>  		ret = kerndat_nsid();
>  	if (!ret)
> +		ret = kerndat_link_nsid();
> +	if (!ret)
>  		ret = kerndat_has_memfd_create();
>  	if (!ret)
>  		ret = kerndat_detect_stack_guard_gap();
> -- 
> 2.13.6
>