Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/miscfs/fifofs only set CANTRCVMORE if no error.



details:   https://anonhg.NetBSD.org/src/rev/11ee6b4108a8
branches:  trunk
changeset: 772169:11ee6b4108a8
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 21 15:27:50 2011 +0000

description:
only set CANTRCVMORE if no error.

diffstat:

 sys/miscfs/fifofs/fifo_vnops.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9e6d662d1fd8 -r 11ee6b4108a8 sys/miscfs/fifofs/fifo_vnops.c
--- a/sys/miscfs/fifofs/fifo_vnops.c    Wed Dec 21 15:26:57 2011 +0000
+++ b/sys/miscfs/fifofs/fifo_vnops.c    Wed Dec 21 15:27:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fifo_vnops.c,v 1.71 2011/12/20 23:56:29 christos Exp $ */
+/*     $NetBSD: fifo_vnops.c,v 1.72 2011/12/21 15:27:50 christos Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.71 2011/12/20 23:56:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.72 2011/12/21 15:27:50 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -261,7 +261,7 @@
        /*
         * Clear EOF indication after first such return.
         */
-       if (error != EINTR && uio->uio_resid == startresid)
+       if (error == 0 && uio->uio_resid == startresid)
                rso->so_state &= ~SS_CANTRCVMORE;
        if (ap->a_ioflag & IO_NDELAY) {
                if (error == EWOULDBLOCK &&



Home | Main Index | Thread Index | Old Index