[PATCH] kill TIOCTTYGSTRUCT

Only used for (dubious) debugging purposes, and exposes
internal kernel state.

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 0a92111694cf4c278093036beaebdecd1ee68204..f3c2f35381acaf0659106bcb078448d31dae128f 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1662,13 +1662,6 @@ static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t *
        return put_user(real_tty->session, arg);
 }
 
-static int tiocttygstruct(struct tty_struct *tty, struct tty_struct *arg)
-{
-       if (copy_to_user(arg, tty, sizeof(*arg)))
-               return -EFAULT;
-       return 0;
-}
-
 static int tiocsetd(struct tty_struct *tty, int *arg)
 {
        int ldisc;
@@ -1795,9 +1788,6 @@ int tty_ioctl(struct inode * inode, struct file * file,
                case TIOCLINUX:
                        return tioclinux(tty, arg);
 #endif
-               case TIOCTTYGSTRUCT:
-                       return tiocttygstruct(tty, (struct tty_struct *) arg);
-
                /*
                 * Break handling
                 */

diff --git a/include/asm-alpha/ioctls.h b/include/asm-alpha/ioctls.h
index a363c50ce6d75bafc20add39d4616720d17cc685..67bb9f6fdbe456fc15377b4bd11b4b86e435f2b4 100644 (file)
--- a/include/asm-alpha/ioctls.h
+++ b/include/asm-alpha/ioctls.h
@@ -86,7 +86,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-arm/ioctls.h b/include/asm-arm/ioctls.h
index ba9c7d81d24e2575f3602a3f4c096b2d87da7a82..bb9a7aa10c12ebc8e58abaaa19b95fb926dfe8ca 100644 (file)
--- a/include/asm-arm/ioctls.h
+++ b/include/asm-arm/ioctls.h
@@ -43,7 +43,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-cris/ioctls.h b/include/asm-cris/ioctls.h
index 21957ec44d7ee9d24ec87fe6d9a088a7fbf77812..1628ad265a89835579abe844b5e189dd3c415a3e 100644 (file)
--- a/include/asm-cris/ioctls.h
+++ b/include/asm-cris/ioctls.h
@@ -45,7 +45,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-i386/ioctls.h b/include/asm-i386/ioctls.h
index ea0e6ae58c299882ddba641950b4a167b956aff7..f962fadab0fadb61c3e85b984f5b9594c73c6c76 100644 (file)
--- a/include/asm-i386/ioctls.h
+++ b/include/asm-i386/ioctls.h
@@ -43,14 +43,14 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
+/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */
 #define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
-#define FIONCLEX       0x5450  /* these numbers need to be adjusted. */
+#define FIONCLEX       0x5450
 #define FIOCLEX                0x5451
 #define FIOASYNC       0x5452
 #define TIOCSERCONFIG  0x5453

diff --git a/include/asm-ia64/ioctls.h b/include/asm-ia64/ioctls.h
index e727e4a6718965a8d4053f5a95d02481db1d6b33..85c740bd4d19e4b67f0481683c2503de3b7ea841 100644 (file)
--- a/include/asm-ia64/ioctls.h
+++ b/include/asm-ia64/ioctls.h
@@ -48,7 +48,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-m68k/ioctls.h b/include/asm-m68k/ioctls.h
index 89c0df1262edfa0ae60043c86031a4a42521e6cf..0c48929ab444e07aeb8e1e5f7580add25ff85fe2 100644 (file)
--- a/include/asm-m68k/ioctls.h
+++ b/include/asm-m68k/ioctls.h
@@ -43,7 +43,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-mips/ioctls.h b/include/asm-mips/ioctls.h
index 1b238a9acd28ea9aedebee58556ce2ae975308a7..1fd384f2bc134f4640339c01b4f8aead87efaa10 100644 (file)
--- a/include/asm-mips/ioctls.h
+++ b/include/asm-mips/ioctls.h
@@ -74,6 +74,12 @@
 /* #define TIOCSETD    _IOW('t', 27, int)      set line discipline */
                                                /* 127-124 compat */
 
+#define TIOCSBRK       0x5427  /* BSD compatibility */
+#define TIOCCBRK       0x5428  /* BSD compatibility */
+#define TIOCGSID       0x7416  /* Return the session ID of FD */
+#define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
+#define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
+
 /* I hope the range from 0x5480 on is free ... */
 #define TIOCSCTTY      0x5480          /* become controlling tty */
 #define TIOCGSOFTCAR   0x5481
@@ -81,15 +87,7 @@
 #define TIOCLINUX      0x5483
 #define TIOCGSERIAL    0x5484
 #define TIOCSSERIAL    0x5485
-
 #define TCSBRKP                0x5486  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5487  /* For debugging only */
-#define TIOCSBRK       0x5427  /* BSD compatibility */
-#define TIOCCBRK       0x5428  /* BSD compatibility */
-#define TIOCGSID       0x7416  /* Return the session ID of FD */
-#define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
 #define TIOCSERCONFIG  0x5488
 #define TIOCSERGWILD   0x5489
 #define TIOCSERSWILD   0x548a

diff --git a/include/asm-mips64/ioctls.h b/include/asm-mips64/ioctls.h
index 1b238a9acd28ea9aedebee58556ce2ae975308a7..1fd384f2bc134f4640339c01b4f8aead87efaa10 100644 (file)
--- a/include/asm-mips64/ioctls.h
+++ b/include/asm-mips64/ioctls.h
@@ -74,6 +74,12 @@
 /* #define TIOCSETD    _IOW('t', 27, int)      set line discipline */
                                                /* 127-124 compat */
 
+#define TIOCSBRK       0x5427  /* BSD compatibility */
+#define TIOCCBRK       0x5428  /* BSD compatibility */
+#define TIOCGSID       0x7416  /* Return the session ID of FD */
+#define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
+#define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
+
 /* I hope the range from 0x5480 on is free ... */
 #define TIOCSCTTY      0x5480          /* become controlling tty */
 #define TIOCGSOFTCAR   0x5481
@@ -81,15 +87,7 @@
 #define TIOCLINUX      0x5483
 #define TIOCGSERIAL    0x5484
 #define TIOCSSERIAL    0x5485
-
 #define TCSBRKP                0x5486  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5487  /* For debugging only */
-#define TIOCSBRK       0x5427  /* BSD compatibility */
-#define TIOCCBRK       0x5428  /* BSD compatibility */
-#define TIOCGSID       0x7416  /* Return the session ID of FD */
-#define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
 #define TIOCSERCONFIG  0x5488
 #define TIOCSERGWILD   0x5489
 #define TIOCSERSWILD   0x548a

diff --git a/include/asm-parisc/ioctls.h b/include/asm-parisc/ioctls.h
index 7b559dc2c253dd3e39df92eccc578ac31b6bf631..ee84e4172c3602b209ae58d38d680450a63b2abc 100644 (file)
--- a/include/asm-parisc/ioctls.h
+++ b/include/asm-parisc/ioctls.h
@@ -43,7 +43,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       _IOR('T', 20, int) /* Return the session ID of FD */

diff --git a/include/asm-ppc/ioctls.h b/include/asm-ppc/ioctls.h
index e700d29fd47e0d12ad6a2625aab5ae9381a900f9..f5b7f2b055e77753a65edbdda0832cc23bc4e530 100644 (file)
--- a/include/asm-ppc/ioctls.h
+++ b/include/asm-ppc/ioctls.h
@@ -83,7 +83,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-ppc/termios.h b/include/asm-ppc/termios.h
index e9c7434dafe5518c282577d17a29f0d8f0079b66..f40419842fb977fdbcc39d8e38d5461d3a0722c7 100644 (file)
--- a/include/asm-ppc/termios.h
+++ b/include/asm-ppc/termios.h
@@ -97,7 +97,6 @@ struct ltchars {
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 
 #define TIOCSERCONFIG  0x5453
 #define TIOCSERGWILD   0x5454

diff --git a/include/asm-ppc64/ioctls.h b/include/asm-ppc64/ioctls.h
index ae5da96000adbe14b8b2504edc95beddad060158..48796bf3e4fc293456df9936b5641529b6da5f41 100644 (file)
--- a/include/asm-ppc64/ioctls.h
+++ b/include/asm-ppc64/ioctls.h
@@ -90,7 +90,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-ppc64/termios.h b/include/asm-ppc64/termios.h
index bbe356d9ab6a5ac32dfb054455e94574a3f600c1..02c3d283aa62bc1b4d7c5d1b22ce03ee4b8771eb 100644 (file)
--- a/include/asm-ppc64/termios.h
+++ b/include/asm-ppc64/termios.h
@@ -152,7 +152,6 @@ struct termio {
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 
 #define TIOCSERCONFIG  0x5453
 #define TIOCSERGWILD   0x5454

diff --git a/include/asm-s390/ioctls.h b/include/asm-s390/ioctls.h
index db7b0a0c36c8048904936a9a1bcf3f839dabe847..07e19b2dd73fd0181c50cb32c3c59a1b0c969d3d 100644 (file)
--- a/include/asm-s390/ioctls.h
+++ b/include/asm-s390/ioctls.h
@@ -51,7 +51,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-s390x/ioctls.h b/include/asm-s390x/ioctls.h
index db7b0a0c36c8048904936a9a1bcf3f839dabe847..07e19b2dd73fd0181c50cb32c3c59a1b0c969d3d 100644 (file)
--- a/include/asm-s390x/ioctls.h
+++ b/include/asm-s390x/ioctls.h
@@ -51,7 +51,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-sh/ioctls.h b/include/asm-sh/ioctls.h
index f535202e8380d383b4fd7a270ecba887adf08bdc..1866f3f90028204119028e5e4c6f6ce2bd2c8e39 100644 (file)
--- a/include/asm-sh/ioctls.h
+++ b/include/asm-sh/ioctls.h
@@ -75,7 +75,6 @@
 #define TIOCSETD       _IOW('T', 35, int) /* 0x5423 */
 #define TIOCGETD       _IOR('T', 36, int) /* 0x5424 */
 #define TCSBRKP                _IOW('T', 37, int) /* 0x5425 */ /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT _IOR('T', 38, struct tty_struct) /* 0x5426 */ /* For debugging only */
 #define TIOCSBRK       _IO('T', 39) /* 0x5427 */ /* BSD compatibility */
 #define TIOCCBRK       _IO('T', 40) /* 0x5428 */ /* BSD compatibility */
 #define TIOCGSID       _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session ID of FD */

diff --git a/include/asm-sparc/ioctls.h b/include/asm-sparc/ioctls.h
index 531460ef91ff0e043f863e2cd02bced4fa0aba97..bdf77b0dfd8e5875cd4a50a1f9c2c8708f1c3e52 100644 (file)
--- a/include/asm-sparc/ioctls.h
+++ b/include/asm-sparc/ioctls.h
@@ -99,7 +99,6 @@
 #define TIOCGSERIAL    0x541E
 #define TIOCSSERIAL    0x541F
 #define TCSBRKP                0x5425
-#define TIOCTTYGSTRUCT 0x5426
 #define TIOCSERCONFIG  0x5453
 #define TIOCSERGWILD   0x5454
 #define TIOCSERSWILD   0x5455

diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h
index 0c8068dc32a9129c71fc64c040a963f51b91114e..2223b6d0e5ed882c983b5717c9adff133bf013a2 100644 (file)
--- a/include/asm-sparc64/ioctls.h
+++ b/include/asm-sparc64/ioctls.h
@@ -100,7 +100,6 @@
 #define TIOCGSERIAL    0x541E
 #define TIOCSSERIAL    0x541F
 #define TCSBRKP                0x5425
-#define TIOCTTYGSTRUCT 0x5426
 #define TIOCSERCONFIG  0x5453
 #define TIOCSERGWILD   0x5454
 #define TIOCSERSWILD   0x5455

diff --git a/include/asm-v850/ioctls.h b/include/asm-v850/ioctls.h
index a765e0a3de7f52e0d988c2f2ecbdf84ab66bd9c1..05c0dc9ce1ea8b149a6dabe22d9ce1ccd4f4034f 100644 (file)
--- a/include/asm-v850/ioctls.h
+++ b/include/asm-v850/ioctls.h
@@ -43,7 +43,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */

diff --git a/include/asm-x86_64/ioctls.h b/include/asm-x86_64/ioctls.h
index 43a25b745626ac4ff0db75bbacfb7b560e1fc5ef..62caf8b6e4e171dcac87295fa577f6d1f49d1163 100644 (file)
--- a/include/asm-x86_64/ioctls.h
+++ b/include/asm-x86_64/ioctls.h
@@ -43,7 +43,6 @@
 #define TIOCSETD       0x5423
 #define TIOCGETD       0x5424
 #define TCSBRKP                0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426  /* For debugging only */
 #define TIOCSBRK       0x5427  /* BSD compatibility */
 #define TIOCCBRK       0x5428  /* BSD compatibility */
 #define TIOCGSID       0x5429  /* Return the session ID of FD */