diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2004-07-21 17:05:41 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2004-07-21 17:05:41 +0000 |
| commit | 7d895c793c3b0ba624608b386711eed9ee2e7219 (patch) | |
| tree | 87443062ece775f3846f70dfaf9005e4584f1661 /sys/kern | |
| parent | 8b1fd7b8f97f198bb5bfdfb2da1a642731335420 (diff) | |
In pipe_read, when the pipelock fails (most likely because we catch a
signal), don't jump to unlocked_error: and do things that we don't need
to do (including messing up the internal state of the pipe). Just return.
ok niklas@ miod@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/sys_pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 7e4966a861e..2fd73bea680 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.47 2004/06/24 19:35:24 tholo Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.48 2004/07/21 17:05:40 art Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -285,7 +285,7 @@ pipe_read(fp, poff, uio, cred) error = pipelock(rpipe); if (error) - goto unlocked_error; + return (error); ++rpipe->pipe_busy; |