[Devel] [PATCH rh7 1/3] Revert "ve/pty: containerize Unix98 pty drivers"

[Vladimir Davydov]

This reverts commit 79b66035f81e1c8996f2524f26af096e44e2ae4b.

Conflicts:
        kernel/ve/ve.c
---
 kernel/ve/ve.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index c2495acf9546..1acb631a7f3c 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -449,10 +449,6 @@ int ve_start_container(struct ve_struct *ve)
        if (err)
                goto err_legacy_pty;
 
-       err = ve_unix98_pty_init(ve);
-       if (err)
-               goto err_unix98_pty;
-
        err = ve_tty_console_init(ve);
        if (err)
                goto err_tty_console;
@@ -472,8 +468,6 @@ int ve_start_container(struct ve_struct *ve)
 err_iterate:
        ve_tty_console_fini(ve);
 err_tty_console:
-       ve_unix98_pty_fini(ve);
-err_unix98_pty:
        ve_legacy_pty_fini(ve);
 err_legacy_pty:
        ve_stop_umh(ve);
@@ -506,7 +500,6 @@ void ve_stop_ns(struct pid_namespace *pid_ns)
        ve->is_running = 0;
 
        ve_tty_console_fini(ve);
-       ve_unix98_pty_fini(ve);
        ve_legacy_pty_fini(ve);
 
        ve_stop_umh(ve);
-- 
2.1.4

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel