leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] new tty buffering access fix

Browse Source 
Fix typos in new tty buffering that incorrectly
access and update buffers in pending queue.

Signed-off-by: Paul Fulghum <paulkf@microgate.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paul Fulghum 2006-01-11 17:51:48 -06:00 committed by Linus Torvalds
parent 4cec873614
commit 607f4e3864
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/tty_io.c
View File

@ -312,7 +312,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
int tty_buffer_request_room(struct tty_struct *tty, size_t size) int tty_buffer_request_room(struct tty_struct *tty, size_t size)
{ {
struct tty_buffer *b = tty->buf.head, *n; struct tty_buffer *b = tty->buf.tail, *n;
int left = 0; int left = 0;
/* OPTIMISATION: We could keep a per tty "zero" sized buffer to /* OPTIMISATION: We could keep a per tty "zero" sized buffer to
@ -326,7 +326,6 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size)
n = tty_buffer_find(tty, size); n = tty_buffer_find(tty, size);
if(n == NULL) if(n == NULL)
return left; return left;
n->next = b;
if(b != NULL) if(b != NULL)
b->next = n; b->next = n;
else else
@ -2751,6 +2750,8 @@ static void flush_to_ldisc(void *private_)
spin_lock_irqsave(&tty->read_lock, flags); spin_lock_irqsave(&tty->read_lock, flags);
while((tbuf = tty->buf.head) != NULL) { while((tbuf = tty->buf.head) != NULL) {
tty->buf.head = tbuf->next; tty->buf.head = tbuf->next;
if (tty->buf.head == NULL)
tty->buf.tail = NULL;
spin_unlock_irqrestore(&tty->read_lock, flags); spin_unlock_irqrestore(&tty->read_lock, flags);
/* printk("Process buffer %p for %d\n", tbuf, tbuf->used); */ /* printk("Process buffer %p for %d\n", tbuf, tbuf->used); */
disc->receive_buf(tty, tbuf->char_buf_ptr, disc->receive_buf(tty, tbuf->char_buf_ptr,
@ -2759,7 +2760,6 @@ static void flush_to_ldisc(void *private_)
spin_lock_irqsave(&tty->read_lock, flags); spin_lock_irqsave(&tty->read_lock, flags);
tty_buffer_free(tty, tbuf); tty_buffer_free(tty, tbuf);
} }
tty->buf.tail = NULL;
spin_unlock_irqrestore(&tty->read_lock, flags); spin_unlock_irqrestore(&tty->read_lock, flags);
out: out:
tty_ldisc_deref(disc); tty_ldisc_deref(disc);