From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - n_hdlc-honor-o_nonblock-on-write.patch removed from -mm tree Date: Fri, 18 Jul 2008 16:24:32 -0700 Message-ID: <200807182324.m6INOW8A004202@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:52345 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759005AbYGRXZQ (ORCPT ); Fri, 18 Jul 2008 19:25:16 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: paulkf@microgate.com, alan@lxorguk.ukuu.org.uk, jirislaby@gmail.com, mm-commits@vger.kernel.org The patch titled n_hdlc: honor O_NONBLOCK on write has been removed from the -mm tree. Its filename was n_hdlc-honor-o_nonblock-on-write.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: n_hdlc: honor O_NONBLOCK on write From: Paul Fulghum Make n_hdlc line discipline honor the O_NONBLOCK file flag on write. Signed-off-by: Paul Fulghum Cc: Jiri Slaby Cc: Alan Cox Signed-off-by: Andrew Morton --- drivers/char/n_hdlc.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN drivers/char/n_hdlc.c~n_hdlc-honor-o_nonblock-on-write drivers/char/n_hdlc.c --- a/drivers/char/n_hdlc.c~n_hdlc-honor-o_nonblock-on-write +++ a/drivers/char/n_hdlc.c @@ -677,6 +677,10 @@ static ssize_t n_hdlc_tty_write(struct t /* Allocate transmit buffer */ /* sleep until transmit buffer available */ while (!(tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list))) { + if (file->f_flags & O_NONBLOCK) { + error = -EAGAIN; + break; + } schedule(); n_hdlc = tty2n_hdlc (tty); _ Patches currently in -mm which might be from paulkf@microgate.com are linux-next.patch synclink_gt-leave-transmitter-in-reset-state-after-configuration.patch synclink_gt-add-rx-dma-buffer-fill-level-control.patch synclink_gt-add-rx-dma-buffer-fill-level-control-fix-locking-in-error-path-of-rx-enable.patch synclink_gt-improve-tiocoutq-accuracy.patch synclink_gt-improve-and-simplify-write-method.patch