[Devel] [Fwd: Re: vzkernel/kernel/ve/ve.c]

[Sergey Bronnikov]

Patch is inline.

On 13:43 Thu 10 Dec , Sergey Bronnikov wrote:
> Please apply.

> Date: Thu, 10 Dec 2015 02:11:21 +0300
> From: gremlin at gremlin.ru
> To: Sergey Bronnikov <sergeyb at openvz.org>
> CC: gremlin at gremlin.ru
> Subject: Re: vzkernel/kernel/ve/ve.c
> Message-ID: <20151209231121.GA13881 at gremlin.ru>
> 
> On 2015-12-10 02:03:13 +0300, gremlin at gremlin.ru wrote:
> 
>  > +++ vzkernel/kernel/ve/ve.c
> 
> Пардон - неполный дифф прислал...
> 
> 
> -- 
> Alexey V. Vissarionov aka Gremlin from Kremlin
> GPG: 8832FE9FA791F7968AC96E4E909DAC45EF3B1FA8

> --- vzkernel.old/kernel/ve/ve.c 2015-12-10 01:42:47.000000000 +0300
> +++ vzkernel/kernel/ve/ve.c     2015-12-10 02:10:12.000000000 +0300
> @@ -476,9 +476,11 @@
>         if (err)
>                 goto err_umh;
>  
> +#ifdef CONFIG_LEGACY_PTYS
>         err = ve_legacy_pty_init(ve);
>         if (err)
>                 goto err_legacy_pty;
> +#endif
>  
>         err = ve_tty_console_init(ve);
>         if (err)
> @@ -499,8 +501,10 @@
>  err_iterate:
>         ve_tty_console_fini(ve);
>  err_tty_console:
> +#ifdef CONFIG_LEGACY_PTYS
>         ve_legacy_pty_fini(ve);
>  err_legacy_pty:
> +#endif
>         ve_stop_umh(ve);
>  err_umh:
>         ve_stop_kthread(ve);
> @@ -532,7 +536,9 @@
>         ve->is_running = 0;
>  
>         ve_tty_console_fini(ve);
> +#ifdef CONFIG_LEGACY_PTYS
>         ve_legacy_pty_fini(ve);
> +#endif
>  
>         ve_stop_umh(ve);
>         /*
-------------- next part --------------
--- vzkernel.old/kernel/ve/ve.c 2015-12-10 01:42:47.000000000 +0300
+++ vzkernel/kernel/ve/ve.c     2015-12-10 02:10:12.000000000 +0300
@@ -476,9 +476,11 @@
        if (err)
                goto err_umh;
 
+#ifdef CONFIG_LEGACY_PTYS
        err = ve_legacy_pty_init(ve);
        if (err)
                goto err_legacy_pty;
+#endif
 
        err = ve_tty_console_init(ve);
        if (err)
@@ -499,8 +501,10 @@
 err_iterate:
        ve_tty_console_fini(ve);
 err_tty_console:
+#ifdef CONFIG_LEGACY_PTYS
        ve_legacy_pty_fini(ve);
 err_legacy_pty:
+#endif
        ve_stop_umh(ve);
 err_umh:
        ve_stop_kthread(ve);
@@ -532,7 +536,9 @@
        ve->is_running = 0;
 
        ve_tty_console_fini(ve);
+#ifdef CONFIG_LEGACY_PTYS
        ve_legacy_pty_fini(ve);
+#endif
 
        ve_stop_umh(ve);
        /*