[Devel] [PATCH RHEL10 COMMIT] fixup! vtty: fix slave peer lockdep annotation

[Konstantin Khorenko]

The commit is pushed to "branch-rh10-6.12.0-55.52.1.5.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-55.52.1.5.29.vz10
------>
commit a8f2115b3546b74bc0e6276f2cf8b3dde55e03ed
Author: Vladimir Riabchun <vladimir.riabchun at virtuozzo.com>
Date:   Tue Jun 2 21:10:53 2026 +0000

    fixup! vtty: fix slave peer lockdep annotation
    
    vtty_alloc_tty_struct is defined only with CONFIG_VE,
    but its usage in alloc_tty_struct was is covered by
    this guard.
    
    Add this guard and return original tty_set_lock_subclass
    call in vtty_open_master when !CONFIG_VE to keep original
    lockdep behavior.
    
    https://virtuozzo.atlassian.net/browse/VSTOR-130116
    
    Feature: !CONFIG_VE build
    Signed-off-by: Vladimir Riabchun <vladimir.riabchun at virtuozzo.com>
    Reviewed-by: Vasileios Almpanis <vasileios.almpanis at virtuozzo.com>
---
 drivers/tty/pty.c    | 3 +++
 drivers/tty/tty_io.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index bbf5699739455..f8610c77817a5 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -1070,6 +1070,9 @@ int vtty_open_master(envid_t veid, int idx)
 		}
 		tty->count--;
 		tty_unlock(tty);
+#ifndef CONFIG_VE
+		tty_set_lock_subclass(tty);
+#endif
 		tty = tty->link;
 	}
 
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 0d1e4ffe2becc..c40996ff7988b 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3213,7 +3213,7 @@ struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx)
 	tty_line_name(driver, idx, tty->name);
 	tty->dev = tty_get_device(tty);
 
-#ifdef CONFIG_TTY
+#if defined(CONFIG_TTY) && defined(CONFIG_VE)
 	vtty_alloc_tty_struct(driver, tty);
 #endif
 	return tty;