[Devel,RHEL7,COMMIT] ms/pty: Remove pty_unix98_shutdown()

Submitted by Konstantin Khorenko on Aug. 7, 2017, 9:54 a.m.

Details

Message ID 201708070954.v779sGq6007282@finist_cl7.x64_64.work.ct
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Aug. 7, 2017, 9:54 a.m. 
The commit is pushed to "branch-rh7-3.10.0-514.26.1.vz7.35.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.26.1.vz7.33.22
------>
commit af64e84e434bdf0b5fa8bd80f7154ad0f969162e
Author: Peter Hurley <peter@hurleysoftware.com>
Date:   Mon Aug 7 13:54:16 2017 +0400

    ms/pty: Remove pty_unix98_shutdown()
    
    The tty core invokes the optional driver shutdown() just before
    the optional driver remove() (shutdown() has access to the termios
    and remove() does not). Because pty drivers must prevent the default
    remove() action, the Unix98 pty drivers define a dummy remove() function.
    
    Instead, release the slave index in the remove() method and delete the
    optional shutdown() method.
    
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    
    ==============================================================
    Cherry-pick ms commit c1e33af1ed552258405f2e5a72509af039c0441c
    Take these one for the next patch to apply cleaner.
    
    https://jira.sw.ru/browse/PSBM-67757
    
    Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 drivers/tty/pty.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 471d372..7ae7e1a 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -617,20 +617,13 @@  static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,
 	return tty;
 }
 
-/* We have no need to install and remove our tty objects as devpts does all
-   the work for us */
-
 static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)
 {
 	return pty_common_install(driver, tty, false);
 }
 
-static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
-{
-}
-
 /* this is called once with whichever end is closed last */
-static void pty_unix98_shutdown(struct tty_struct *tty)
+static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
 {
 	struct inode *ptmx_inode;
 
@@ -656,7 +649,6 @@  static const struct tty_operations ptm_unix98_ops = {
 	.set_termios = pty_set_termios,
 	.ioctl = pty_unix98_ioctl,
 	.resize = pty_resize,
-	.shutdown = pty_unix98_shutdown,
 	.cleanup = pty_cleanup
 };
 
@@ -672,7 +664,6 @@  static const struct tty_operations pty_unix98_ops = {
 	.chars_in_buffer = pty_chars_in_buffer,
 	.unthrottle = pty_unthrottle,
 	.set_termios = pty_set_termios,
-	.shutdown = pty_unix98_shutdown,
 	.cleanup = pty_cleanup,
 };