Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752400AbZG0PEq (ORCPT ); Mon, 27 Jul 2009 11:04:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752003AbZG0PEp (ORCPT ); Mon, 27 Jul 2009 11:04:45 -0400 Received: from mail.parknet.ad.jp ([210.171.162.6]:55489 "EHLO mail.officemail.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbZG0PEo (ORCPT ); Mon, 27 Jul 2009 11:04:44 -0400 From: OGAWA Hirofumi To: Alan Cox Cc: Linus Torvalds , "Rafael J. Wysocki" , Ray Lee , LKML , Andrew Morton Subject: Re: [PATCH] kdesu broken References: <200907240145.31935.rjw@sisk.pl> <2c0942db0907231721q124dc8f9mdbe64ed33c69ffbf@mail.gmail.com> <200907241721.45943.rjw@sisk.pl> <20090724164058.21a054e6@lxorguk.ukuu.org.uk> <87ws5xjo2x.fsf@devron.myhome.or.jp> <20090725150510.35e8854d@lxorguk.ukuu.org.uk> <87ab2sx15g.fsf@devron.myhome.or.jp> <20090725163251.50e6f546@lxorguk.ukuu.org.uk> <87bpn7mzli.fsf@devron.myhome.or.jp> <20090727115723.1e8de60e@lxorguk.ukuu.org.uk> <873a8iqqgv.fsf@devron.myhome.or.jp> <20090727142303.41096bf5@lxorguk.ukuu.org.uk> <877hxujkuv.fsf@devron.myhome.or.jp> <20090727145805.690afe5d@lxorguk.ukuu.org.uk> Date: Tue, 28 Jul 2009 00:04:42 +0900 In-Reply-To: <20090727145805.690afe5d@lxorguk.ukuu.org.uk> (Alan Cox's message of "Mon, 27 Jul 2009 14:58:05 +0100") Message-ID: <87fxci6ub9.fsf@devron.myhome.or.jp> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.10/RELEASE, bases: 24052007 #308098, status: clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2425 Lines: 67 Alan Cox writes: >> > + set_bit(TTY_EOFPENDING, &pair->flags); >> > + set_bit(TTY_OTHER_CLOSED, &pair->flags); >> > + spin_unlock_irqrestore(&pair->buf.lock, flags); >> >> tty_flip_buffer_push() or something? >> >> > + wake_up_interruptible(&pair->read_wait); >> > + wake_up_interruptible(&pair->write_wait); >> >> It seems, this sets TTY_EOFPENDING, but if flush_to_ldisc() was done >> already here, anybody doesn't set TTY_EOF for master. > > Does putting a tty_flip_buffer_push() at that point fix it. I had thought > I could remove it but you are right that creates a situation where EOF > may never get set. With this patch, test program seems to work. It seems "done = 0" hunk was needed for correct "done". Thanks. Signed-off-by: OGAWA Hirofumi --- drivers/char/pty.c | 1 + drivers/char/tty_buffer.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/char/pty.c~pty-fixes4-fix drivers/char/pty.c --- linux-2.6/drivers/char/pty.c~pty-fixes4-fix 2009-07-27 23:56:27.000000000 +0900 +++ linux-2.6-hirofumi/drivers/char/pty.c 2009-07-27 23:56:40.000000000 +0900 @@ -64,6 +64,7 @@ static void pty_close(struct tty_struct set_bit(TTY_EOFPENDING, &pair->flags); set_bit(TTY_OTHER_CLOSED, &pair->flags); spin_unlock_irqrestore(&pair->buf.lock, flags); + tty_flip_buffer_push(pair); wake_up_interruptible(&pair->read_wait); wake_up_interruptible(&pair->write_wait); if (tty->driver->subtype == PTY_TYPE_MASTER) { diff -puN drivers/char/tty_buffer.c~pty-fixes4-fix drivers/char/tty_buffer.c --- linux-2.6/drivers/char/tty_buffer.c~pty-fixes4-fix 2009-07-27 23:57:27.000000000 +0900 +++ linux-2.6-hirofumi/drivers/char/tty_buffer.c 2009-07-27 23:57:30.000000000 +0900 @@ -443,10 +443,8 @@ static void flush_to_ldisc(struct work_s done = 0; break; } - if (count > tty->receive_room) { + if (count > tty->receive_room) count = tty->receive_room; - done = 0; - } char_buf = head->char_buf_ptr + head->read; flag_buf = head->flag_buf_ptr + head->read; head->read += count; _ -- OGAWA Hirofumi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/