diff options
author | ed <ed@FreeBSD.org> | 2008-08-23 13:32:21 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2008-08-23 13:32:21 +0000 |
commit | b738ca88a2a505f7f334b2e83a3b29f249bedf4b (patch) | |
tree | f36c92485b7ed443687cd815e281c7c272dfd0be | |
parent | 31729dd5739bedb99a14d1278fa6ab9b68f3746b (diff) | |
download | FreeBSD-src-b738ca88a2a505f7f334b2e83a3b29f249bedf4b.zip FreeBSD-src-b738ca88a2a505f7f334b2e83a3b29f249bedf4b.tar.gz |
Remove unused tty_gone() checks inside ttyoutq_read_uio().
When my earlier MPSAFE TTY prototypes still implemented line
disciplines, we needed a mechanism to abort read()'s on PTY master
devices when inside the line discipline. Because this is no longer the
case, these checks have become unneeded.
-rw-r--r-- | sys/kern/tty_outq.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/kern/tty_outq.c b/sys/kern/tty_outq.c index e945cca..30df4eb 100644 --- a/sys/kern/tty_outq.c +++ b/sys/kern/tty_outq.c @@ -250,12 +250,6 @@ ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio) error = uiomove(tob->tob_data + cbegin, clen, uio); tty_lock(tp); - if (tty_gone(tp)) { - /* We lost the discipline. */ - uma_zfree(ttyoutq_zone, tob); - return (ENXIO); - } - /* Block can now be readded to the list. */ /* * XXX: we could remove the blocks here when the @@ -282,11 +276,6 @@ ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio) error = uiomove(ob, clen, uio); tty_lock(tp); - if (tty_gone(tp)) { - /* We lost the discipline. */ - return (ENXIO); - } - if (error != 0) return (error); } |